Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 29 Nov 2014 11:18:02 +0000 (12:18 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 29 Nov 2014 11:18:02 +0000 (12:18 +0100)
commiteaa3b1ef566ec3301dc648e6e57b39af7915392f
tree199f43c10231399718a46a80355129fe5a209993
parente8a4780cbc0270d7c22556f96a550d87be5ffb56
parentb2af9efa788b773069df27bd5b82666c135305b0
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
owncloud-android-library
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java