Merge branch 'master' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 10 Nov 2015 10:48:53 +0000 (11:48 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 10 Nov 2015 10:48:53 +0000 (11:48 +0100)
commitac646c657491e5a17d82118d5283b484d83f44de
tree8e19d21263c15f5192b59432e79f74d9b1ff059a
parent5252115360e03a21791bd851a7c347d557ba3053
parentc229790208bc80b04ab160704de0ed26a7477613
Merge branch 'master' of https://github.com/owncloud/android into beta
res/values-th-rTH/strings.xml