Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / SquareLinearLayout.java
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70...
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload...
2015-03-10 masensioMerge branch 'develop' into accessibility
2015-03-09 David A. VelascoMerge branch 'develop' into update_propfind_for_server_8.1
2015-03-06 masensioMerge branch 'develop' into share_password_support
2015-03-06 David A. VelascoMerge pull request #912 from owncloud/review_license
2015-03-05 masensioUpdate year in license
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-02-03 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-03 David A. VelascoMerge pull request #731 from owncloud/imageGrid
2015-02-03 David A. VelascoCorrections from my own comments
2015-02-02 David A. VelascoMerge branch 'develop' into imageGrid
2015-01-20 jabarrosMerge branch 'develop' into imageGrid
2015-01-19 tobiasKaminskyMerge branches 'develop' and 'imageGrid' of github...
2015-01-18 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2014-11-18 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-09-18 tobiasKaminsky- renamed ImageViews