# Conflicts: # app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java |
||
---|---|---|
.. | ||
activities | ||
asynctasks | ||
client | ||
drawers | ||
fragments | ||
helper | ||
interfaces | ||
jobs | ||
services | ||
sqlite | ||
webview |
# Conflicts: # app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java |
||
---|---|---|
.. | ||
activities | ||
asynctasks | ||
client | ||
drawers | ||
fragments | ||
helper | ||
interfaces | ||
jobs | ||
services | ||
sqlite | ||
webview |