Adam Jones ba222e147d Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' ... Conflicts: commons/res/values-br/strings.xml commons/res/values-ca/strings.xml commons/res/values-cs/strings.xml commons/res/values-cy/strings.xml commons/res/values-da/strings.xml commons/res/values-de/strings.xml commons/res/values-el/strings.xml commons/res/values-es/strings.xml commons/res/values-fi/strings.xml commons/res/values-fo/strings.xml commons/res/values-fr/strings.xml commons/res/values-gl/strings.xml commons/res/values-id/strings.xml commons/res/values-it/strings.xml commons/res/values-ja/strings.xml commons/res/values-ka/strings.xml commons/res/values-km/strings.xml commons/res/values-ko/strings.xml commons/res/values-ky/strings.xml commons/res/values-la/strings.xml commons/res/values-lb/strings.xml commons/res/values-mk/strings.xml commons/res/values-ml/strings.xml commons/res/values-ms/strings.xml commons/res/values-mt/strings.xml commons/res/values-nb/strings.xml commons/res/values-ne/strings.xml commons/res/values-nl/strings.xml commons/res/values-oc/strings.xml commons/res/values-or/strings.xml commons/res/values-pa/strings.xml commons/res/values-pl/strings.xml commons/res/values-pt-rBR/strings.xml commons/res/values-pt/strings.xml commons/res/values-qq/strings.xml commons/res/values-ro/strings.xml commons/res/values-ru/strings.xml commons/res/values-sk/strings.xml commons/res/values-su/strings.xml commons/res/values-sv/strings.xml commons/res/values-te/strings.xml commons/res/values-tr/strings.xml commons/res/values-uk/strings.xml commons/res/values-vi/strings.xml commons/res/values-yi/strings.xml commons/res/values-zh-rCN/strings.xml commons/res/values-zh-rTW/strings.xml commons/res/values-zh/strings.xml commons/res/values/strings.xml		2016-06-06 07:29:27 +01:00
..
app	Merge branch 'master' of https://github.com/nicolas-raoul/apps-android-commons into nicolas-raoul-master	2016-06-03 09:46:20 +01:00
gradle/wrapper	Gradle test	2016-06-02 16:18:12 +01:00
res	Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'	2016-06-06 07:29:27 +01:00
build.gradle	Gradle test	2016-06-02 16:18:12 +01:00
gradle.properties	Gradle test	2016-06-02 16:18:12 +01:00
gradlew	Gradle test	2016-06-02 16:18:12 +01:00
gradlew.bat	Gradle test	2016-06-02 16:18:12 +01:00
import-summary.txt	Gradle test	2016-06-02 16:18:12 +01:00
settings.gradle	Gradle test	2016-06-02 16:18:12 +01:00