projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: a171969)
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:20:51 +0000 (18:20 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:20:51 +0000 (18:20 +0100)
# Conflicts:
# src/com/owncloud/android/ui/activity/FileDisplayActivity.java


No differences found
ownCloud Android App