David Luhmer b6c7788211 Merge branch 'master' into dev ... # Conflicts: # News-Android-App/build.gradle # News-Android-App/src/main/AndroidManifest.xml # News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java # News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java # News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java # News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java # gradle/wrapper/gradle-wrapper.properties		2019-05-11 20:09:14 +02:00
..
wrapper	Merge branch 'master' into dev	2019-05-11 20:09:14 +02:00