Merge branch 'develop' into videoInstandUploads
authormasensio <masensio@solidgear.es>
Tue, 8 Apr 2014 10:50:50 +0000 (12:50 +0200)
committermasensio <masensio@solidgear.es>
Tue, 8 Apr 2014 10:50:50 +0000 (12:50 +0200)
commit3351db65273a8d8ff1d012e00025e728cc428419
treed7e583b58e9f60897ae9456df96e5f8f606cb23d
parent536cc166b60733aa54466850ee167163fd2f3cbd
parent69d40e505ef57770bddbb24ddc4156e0474993fc
Merge branch 'develop' into videoInstandUploads
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java