projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0a03b6d)
Merge branch 'develop' into enable_cookies
authormasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 12:02:53 +0000 (13:02 +0100)
committermasensio <masensio@solidgear.es>
Thu, 19 Feb 2015 12:02:53 +0000 (13:02 +0100)
Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java


No differences found
ownCloud Android App