Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 08:54:05 +0000 (10:54 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 08:54:05 +0000 (10:54 +0200)
commit6a22a8cd3be7ea0f9670562249b9456c3cc97a9e
treea23f7a23d974ac1e84dd3dce4701014a1475c419
parent0d75348b30c4454bced75f2c2687b2f91b4481c6
parent2b79f3292f5ca8b5e7f15ff6b2303df3d6802b36
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
res/values-de-rDE/strings.xml
res/values-de/strings.xml