Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into...
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 17 Sep 2015 13:38:59 +0000 (15:38 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 17 Sep 2015 13:38:59 +0000 (15:38 +0200)
commiteae9c4e4b0027615159f348c862e9de22c505859
treec9df53fdcd20fe43f209f8ed984e28041a81967d
parentd78077de4da35f0104457c60675421c3f01ba396
parentf6b2b856cbacfee3224247d2a9e8ff0bb37b322e
Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_fab

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