Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Wed, 6 May 2015 17:05:03 +0000 (19:05 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Wed, 6 May 2015 17:05:03 +0000 (19:05 +0200)
commit6a9dfdb3300a6faaf00889f4e919ef92262096de
tree4e1bb7088fc0345d47fe1f798df4f7143ec1b03a
parent606834980cea8cd1a743d7455174ae0be76eb630
parent7939d3feb5a6363b2f001c388219035313a3cbab
Merge branch 'develop' into automationTest
res/values/strings.xml