Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Fri, 29 May 2015 12:17:52 +0000 (14:17 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 29 May 2015 12:17:52 +0000 (14:17 +0200)
commit916bd5c6ca02dde2916732a826814377e495dcfe
treea7d800e3be65ae96acfe6f7b58a4640b8978ce40
parentf973a1db0eae8ff2df538caad210ef3f6fa2bae7
parenta544613d75c3aeab3a97bc459289965c8847b49b
Merge branch 'develop' into automationTest
res/values/strings.xml