tom79 27ae8790a0 Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/main/res/values-es/strings.xml # app/src/main/res/values-eu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-kab/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-zh-rCN/strings.xml		2020-03-07 16:18:59 +01:00
..
assets	Make text selectable	2020-03-07 15:53:56 +01:00
java/app/fedilab/android	Make text selectable	2020-03-07 16:17:28 +01:00
res	Merge branch 'l10n_develop' into develop	2020-03-07 16:18:59 +01:00
AndroidManifest.xml	media in notifications	2019-12-17 16:37:21 +01:00
ic_launcher-web.png	Some changes	2019-11-09 14:35:45 +01:00
ic_launcher_bubbles-web.png	Make the app icon changeable	2019-09-25 17:25:03 +05:30