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
..
activities	Merge remote-tracking branch 'origin/develop' into develop	2019-02-15 19:35:30 +01:00
asynctasks	- Custom Sharing feature debugging	2019-02-13 20:31:28 -06:00
client	Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop-curate_content	2019-02-15 10:12:31 -06:00
drawers	Merge remote-tracking branch 'origin/develop' into develop	2019-02-15 19:35:30 +01:00
fragments	Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop-curate_content	2019-02-15 10:12:31 -06:00
helper	Merge remote-tracking branch 'origin/develop' into develop	2019-02-15 19:35:30 +01:00
interfaces	- 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
jobs	Start splitting notification Fragment	2019-02-03 12:07:43 +01:00
services	Logout users	2019-01-29 14:08:02 +01:00
sqlite	Improve ads blocker	2019-02-15 18:19:32 +01:00
webview	Improve ads blocker	2019-02-15 18:43:48 +01:00