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)
1  2 
res/values-th-rTH/strings.xml

Simple merge