Merge remote-tracking branch 'upstream/develop' into imageGrid
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 5 Nov 2014 21:07:11 +0000 (22:07 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 5 Nov 2014 21:07:11 +0000 (22:07 +0100)
commitf331120a147b95e7a27fb765de2e210d4af892ca
tree2ac01675dfe265bb3ecff6acaf6689243b59e8e7
parentf1465210f01482304141f57d0bb88a0336630679
parent80cfc55fda1f71124e2a658b46229cbb7c1feb77
Merge remote-tracking branch 'upstream/develop' into imageGrid

Conflicts:
owncloud-android-library
res/layout/list_item.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
owncloud-android-library
res/layout/list_item.xml
src/com/owncloud/android/MainApp.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java