Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
authormasensio <masensio@solidgear.es>
Fri, 20 Mar 2015 13:55:48 +0000 (14:55 +0100)
committermasensio <masensio@solidgear.es>
Fri, 20 Mar 2015 13:55:48 +0000 (14:55 +0100)
commitc0da8a93f24f4f87256e71c32f3c2a300d22e62f
tree1a45eaca990e7eb2a38d52d70f41b6f10f8c82c5
parent879160bebed4f1def5a1d1719b29251393192dfe
parent205bd47325604d730935c9203d75b6ff5ae3dd9a
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
res/values/strings.xml