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
..
assets	Adds cache clear feature	2017-06-19 19:20:20 +02:00
java/fr/gouv/etalab/mastodon	Merge branch 'develop' of https://bitbucket.org/tom79/mastodon_etalab into develop	2017-09-01 19:58:41 +02:00
res	Fixes German translation	2017-09-01 18:31:08 +02:00
AndroidManifest.xml	Fixes issue #11	2017-09-01 17:55:14 +02:00
ic_launcher-web.png	Fixes a bug with conversations	2017-07-08 11:32:38 +02:00