Arnaud Jacquemin 5e8b06f750 Merge branch 'master' of https://github.com/arnaud-jacquemin/dandelion.git into stringlate-fr-9719 ... # Conflicts: # app/build.gradle # app/src/main/java/net/gsantner/opoc/util/ContextUtils.java # app/src/main/res/values-fr/strings.xml		2018-05-08 23:40:10 +02:00
..
src/main	Merge branch 'master' of https://github.com/arnaud-jacquemin/dandelion.git into stringlate-fr-9719	2018-05-08 23:40:10 +02:00
.gitignore	Initial commit	2016-03-03 17:46:31 +01:00
build.gradle	Release v1.1.3	2018-04-08 22:10:53 +02:00
proguard-rules.pro	Initial commit	2016-03-03 17:46:31 +01:00