projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5fdba5 b6e4f0f)
Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 19 Jan 2015 21:24:33 +0000 (22:24 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 19 Jan 2015 21:24:33 +0000 (22:24 +0100)
Conflicts:
gradle/wrapper/gradle-wrapper.properties
owncloud-android-library


Trivial merge
ownCloud Android App