Merge branch 'beta' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 9 Nov 2015 09:53:14 +0000 (10:53 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 9 Nov 2015 09:53:14 +0000 (10:53 +0100)
commit038eab1cf77d798df2dd53d544a0e13713beff47
treee82854812489d2952bb540b33d262b406b9c0991
parent989c3379798a744100fadb82d9fbfa3ecf8ff6e4
parentb6ad1b862cc960837467274b5096d0d7aefe54ea
Merge branch 'beta' of https://github.com/owncloud/android into beta