Mathieu Sanchez 055be5f968 Merge branch 'master' into beta ... # Conflicts: # app/build.gradle # app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/PdfUtils.kt		2020-10-24 17:23:06 +02:00
..
src	Merge branch 'master' into beta	2020-10-24 17:23:06 +02:00
.gitignore	Adding base app	2020-04-12 01:17:34 +02:00
build.gradle	Merge branch 'master' into beta	2020-10-24 17:23:06 +02:00
proguard-rules.pro	Issue-8: Adding Keep class com.showckwave to proguard	2020-04-26 10:14:47 +02:00