Merge branch 'master' of https://github.com/owncloud/News-Android-App · nextcloud/news-android@cb4ab44 · GitHub

Commit

Merge branch 'master' of https://github.com/owncloud/News-Android-App

Browse files

Conflicts:
	News-Android-App.apk
	News-Android-App/News-Android-App-News-Android-App.iml
	News-Android-App/src/main/AndroidManifest.xml

Loading branch information

David-Development committed Jan 17, 2015

2 parents 3f37932 + 4f33860 commit cb4ab44