stom79 997bba9ce3 Merge branch 'partnership' into develop ... # Conflicts: # app/src/main/res/values/strings.xml		2018-09-01 14:07:07 +02:00
..
assets	Removes fonts	2018-01-25 11:24:53 +01:00
java/fr/gouv/etalab/mastodon	Merge branch 'partnership' into develop	2018-09-01 14:07:07 +02:00
res	Merge branch 'partnership' into develop	2018-09-01 14:07:07 +02:00
AndroidManifest.xml	Partnership masto.host	2018-09-01 08:13:22 +02:00
ic_launcher-web.png	default size	2017-10-08 16:54:47 +02:00