Merge branch 'develop' into uploadWhenCharging
authormasensio <masensio@solidgear.es>
Tue, 1 Sep 2015 14:51:40 +0000 (16:51 +0200)
committermasensio <masensio@solidgear.es>
Tue, 1 Sep 2015 14:51:40 +0000 (16:51 +0200)
commitefb3989ee67b2d7d7bb16725d7b5bfd172b5d134
treeb959c10920916e99f9e257f8366421a76cb4cb08
parente0e6512974b771720ebe41bf88f84b74d539e6ed
parent136db6a76553678c866019be6010f51ae1a3751c
Merge branch 'develop' into uploadWhenCharging

Conflicts:
res/values-fr/strings.xml
res/xml/preferences.xml
AndroidManifest.xml
res/values-fr/strings.xml
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java