tom79 8ccfb51c19 Merge branch 'fix_mentions' into develop ... # Conflicts: # app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java		2019-07-04 19:46:36 +02:00
..
assets	Remove font + allows to modify pictures	2019-05-31 14:58:09 +02:00
java/app/fedilab/android	Merge branch 'fix_mentions' into develop	2019-07-04 19:46:36 +02:00
res	Merge branch 'l10n_develop' into develop	2019-07-04 19:05:18 +02:00
AndroidManifest.xml	only once	2019-07-02 19:20:06 +02:00
ic_launcher-web.png	Change icon launcher	2019-05-18 11:19:59 +02:00