tom79 21a86957de Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop ... # Conflicts: # app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java		2017-09-01 19:58:41 +02:00
..
fdroid/java/fr.gouv.etalab.mastodon/activities	image upload when sharing - 1	2017-09-01 19:14:42 +02:00
main	Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop	2017-09-01 19:58:41 +02:00
safetynet/java/fr.gouv.etalab.mastodon/activities	image upload when sharing - 1	2017-09-01 19:14:42 +02:00