Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
[pub/Android/ownCloud.git] / res / values / attrs.xml
2015-10-18 tobiasKaminskyMerge branch 'uploadWhenCharging' of github.com:ownclou...
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti...
2015-08-21 gstraubeMerge remote-tracking branch 'upstream/develop' into...
2015-08-21 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android...
2015-08-21 purigarciaMerge branch 'develop' into ignoreHiddenFiles
2015-08-20 masensioMerge pull request #1076 from owncloud/material_toolbar
2015-08-17 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-14 Andy Scherzingermerged part of the fixes from material buttons branch...
2012-05-01 Bartek Przybylskiinitial commit of editbox with badge