From: Andy Scherzinger Date: Thu, 17 Sep 2015 13:39:27 +0000 (+0200) Subject: Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into... X-Git-Tag: beta-20151128~7^2~23 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/eb7bcfbd2e89b0e9dbd416a8c8b8d3ff1265b475 Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_buttons Conflicts: owncloud-android-library res/layout-land/account_setup.xml --- eb7bcfbd2e89b0e9dbd416a8c8b8d3ff1265b475