projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbbb702 f6b2b85)
Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into...
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 17 Sep 2015 13:39:27 +0000 (15:39 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 17 Sep 2015 13:39:27 +0000 (15:39 +0200)
Conflicts:
owncloud-android-library
res/layout-land/account_setup.xml


Trivial merge
ownCloud Android App