Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 11:01:40 +0000 (13:01 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 11:01:40 +0000 (13:01 +0200)
commit275028a5e33e0ca7fd9901c4649939bad66311c4
tree6ea070769749fc199977da15ca7b58ef47ea6632
parent4a4296a07e0a632f83cfc306ddaa7f74b4ca6c7b
parent2b79f3292f5ca8b5e7f15ff6b2303df3d6802b36
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
res/values-de-rDE/strings.xml
res/values-de/strings.xml