tom79 7bf58eead8 Merge branch 'changes_font' into develop ... # Conflicts: # app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java		2017-10-15 09:34:48 +02:00
..
fdroid/java/fr.gouv.etalab.mastodon/activities	Merge branch 'filter_toots' into develop	2017-10-13 20:23:58 +02:00
main	Merge branch 'changes_font' into develop	2017-10-15 09:34:48 +02:00
safetynet/java/fr.gouv.etalab.mastodon/activities	Changes rounded corners	2017-10-11 17:18:32 +02:00