fedilab-Android-App/app/src/main/java/fr/gouv/etalab/mastodon
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
jobs
services
sqlite Improve ads blocker 2019-02-15 18:19:32 +01:00
webview Improve ads blocker 2019-02-15 18:43:48 +01:00