Merge remote-tracking branch 'origin/master'

Browse source

Conflicts:
	News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/DatabaseConnectionOrm.java

...

This commit is contained in:

David Development 2015-01-17 20:31:55 +01:00

parent 02c862c011 15445c2c0d

commit 6d2f83eafc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available