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
..
app/fedilab/android	Merge branch 'fix_mentions' into develop	2019-07-04 19:46:36 +02:00