[tx-robot] updated from transifex
[pub/Android/ownCloud.git] / res / drawable / conflict_file_indicator.png
2015-11-20 Maria AsensioMerge pull request #1119 from owncloud/strip-index...
2015-11-06 Maria AsensioMerge pull request #1184 from Wikinaut/show-certificate...
2015-10-30 Maria AsensioMerge pull request #1109 from owncloud/sync_full_folder
2015-10-27 masensioMerge branch 'master' into sync_full_folder
2015-09-30 masensioMerge branch 'master' into sync_full_folder
2015-09-25 David A. VelascoPersist conflicts in local database and show with an...