Skip to content
Commit eaa3b1ef authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

Merge remote-tracking branch 'upstream/develop' into triggerMediaScan 

-fr/strings.xml

Conflicts:
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/datamodel/OCFile.java
parents e8a4780c b2af9efa
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment