Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 2 Dec 2015 19:25:13 +0000 (20:25 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 2 Dec 2015 19:25:13 +0000 (20:25 +0100)
commit7326405ebb29a640388ebb9d782986ebf12e865f
tree05a83b98b00b5eaaefd48b886e93e738c8b37acc
parent9fec706b31cad885e3b9dd72c68750aeebd6f464
parent872e32475bcabd7e15ba5230926155fefc61eb15
Merge remote-tracking branch 'remotes/upstream/master' into beta
res/values-nl/strings.xml
res/values-ru/strings.xml
res/values-sl/strings.xml
res/values-sv/strings.xml