projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: dc02769 112cc0f)
Merge branch 'master' into saml_based_federated_single_sign_on_expired
authormasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:20:59 +0000 (10:20 +0200)
committermasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:20:59 +0000 (10:20 +0200)

Trivial merge
ownCloud Android App