Merge branch 'master' into develop
[pub/Android/ownCloud.git] / res / values-yo / strings.xml
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-01-20 jabarrosMerge branch 'develop' into SettingsGreyedOut
2015-01-19 David A. VelascoMerge pull request #798 from LukeOwncloud/develop
2015-01-19 jabarrosMerge branch 'develop' into download_folder
2015-01-18 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2015-01-14 David A. VelascoMerge pull request #746 from owncloud/thumbnailForUpload
2015-01-14 Jenkins for ownCloud[tx-robot] updated from transifex