tom79 61dfdc9bd6 Merge branch 'bug_fixes' into develop ... # Conflicts: # app/src/main/res/layout/drawer_status.xml		2019-05-18 15:01:16 +02:00
..
app/fedilab/android	Merge branch 'bug_fixes' into develop	2019-05-18 15:01:16 +02:00