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)
commiteb7bcfbd2e89b0e9dbd416a8c8b8d3ff1265b475
tree24cfa63de4bcec21364215a5f238859f1ef8172c
parentbbbb7026b4809f22ec4964c2789c3a57627cba3c
parentf6b2b856cbacfee3224247d2a9e8ff0bb37b322e
Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_buttons

Conflicts:
owncloud-android-library
res/layout-land/account_setup.xml