stom79 997bba9ce3 Merge branch 'partnership' into develop ... # Conflicts: # app/src/main/res/values/strings.xml		2018-09-01 14:07:07 +02:00
..
fdroid/java/fr.gouv.etalab.mastodon/activities	Removes Safetynet library	2017-12-09 18:16:20 +01:00
main	Merge branch 'partnership' into develop	2018-09-01 14:07:07 +02:00
playstore/java/fr.gouv.etalab.mastodon/activities	Removes Safetynet library	2017-12-09 18:16:20 +01:00