David Luhmer a3d0e02a59 Merge branch 'master' into sso-annotation-support ... # Conflicts: # News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/API_SSO.java		2019-04-04 16:03:31 -03:00
..
src	Merge branch 'master' into sso-annotation-support	2019-04-04 16:03:31 -03:00
.gitignore	Update project structure for gradle build system	2014-01-24 09:45:36 +01:00
build.gradle	Merge branch 'master' into sso-annotation-support	2019-04-04 16:03:31 -03:00
proguard-android.txt	Fix #587 - 0.9.9.9 crashes immediately	2017-10-25 17:46:54 +02:00
proguard-rules.txt	cleanup / refactoring	2018-10-28 17:56:51 +01:00
remove_invalid_languages.sh	Fixed remove_invalid_languages path.	2015-11-21 21:09:31 +01:00