tom79 7b92d0feff Merge branch 'develop' into improves_conversations ... # Conflicts: # app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java # app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java # app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java		2017-10-21 14:41:12 +02:00
..
assets	Changes police	2017-10-15 09:29:59 +02:00
java/fr/gouv/etalab/mastodon	Merge branch 'develop' into improves_conversations	2017-10-21 14:41:12 +02:00
res	Merge branch 'bug_fix' into develop	2017-10-18 14:32:49 +02:00
AndroidManifest.xml	Prepares service for local timeline	2017-09-30 08:48:44 +02:00
ic_launcher-web.png	default size	2017-10-08 16:54:47 +02:00