David Luhmer 632cac0e2a Merge branch 'master' of https://github.com/owncloud/News-Android-App ... # Conflicts: # News-Android-App/src/main/res/values-nb-rNO/strings.xml # News-Android-App/src/main/res/values-ru/strings.xml		2018-05-11 15:32:52 +02:00
..
src	Merge branch 'master' of https://github.com/owncloud/News-Android-App	2018-05-11 15:32:52 +02:00
.gitignore	Update project structure for gradle build system	2014-01-24 09:45:36 +01:00
build.gradle	Update build files / Update Support Version / Update auto-value / enable shrinkResources	2018-01-21 15:05:53 +01:00
proguard-android.txt	Fix #587 - 0.9.9.9 crashes immediately	2017-10-25 17:46:54 +02:00
proguard-rules.txt	Fix FavIcon issues / Updated ImageLoader init (use di injection) / Update ProGuard Rules	2017-05-27 00:42:59 +02:00
remove_invalid_languages.sh	Fixed remove_invalid_languages path.	2015-11-21 21:09:31 +01:00