stom79 2d06ca921a Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java		2019-02-15 19:35:30 +01:00
..
assets	…
java/fr/gouv/etalab/mastodon	Merge remote-tracking branch 'origin/develop' into develop	2019-02-15 19:35:30 +01:00
res	Merge remote-tracking branch 'origin/develop' into develop	2019-02-15 19:35:30 +01:00
AndroidManifest.xml	- Added Custom Sharing feature to allow Mastodon/Misskey status metadata to be shared to remote content aggregator	2019-02-13 14:08:53 -06:00
ic_launcher-web.png	Fix background issue for the logo	2019-02-10 16:01:35 +01:00