Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 19 Jan 2015 21:24:33 +0000 (22:24 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 19 Jan 2015 21:24:33 +0000 (22:24 +0100)
commit3c79991b12536b922ec9453f5fbff9486620446c
tree12ad5ff1d08663551b3d3d1efd546d4f61518a5b
parentb5fdba576fa6754f257f31f24475f198eb27d06a
parentb6e4f0f4ae761c0c30452baa2c717fb82256c4dc
Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2

Conflicts:
gradle/wrapper/gradle-wrapper.properties
owncloud-android-library