projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: bc472ee)
Merge branch '1193_uploader_layout' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 10 Nov 2015 10:27:23 +0000 (11:27 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 10 Nov 2015 10:27:23 +0000 (11:27 +0100)
Conflicts:
res/layout/uploader_layout.xml
res/layout/uploader_list_item_layout.xml
src/com/owncloud/android/ui/activity/Uploader.java


No differences found
ownCloud Android App