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
..
etalab/mastodon	Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop	2017-09-01 19:58:41 +02:00