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
..
colors.xml	Last fixes	2019-02-13 18:36:29 +01:00
dimens.xml	Improve ads blocker	2019-02-15 18:19:32 +01:00
drawables.xml	initial commit	2017-05-05 16:36:04 +02:00
strings.xml	Merge remote-tracking branch 'origin/develop' into develop	2019-02-15 19:35:30 +01:00
styles.xml	Some fixes	2019-01-12 17:36:24 +01:00