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
..
fdroid/java/fr.gouv.etalab.mastodon/activities	use base classes for login and main activity, fixes #27	2017-10-17 13:13:35 +02:00
main	Merge branch 'develop' into improves_conversations	2017-10-21 14:41:12 +02:00
safetynet/java/fr.gouv.etalab.mastodon/activities	use base classes for login and main activity, fixes #27	2017-10-17 13:13:35 +02:00