Merge remote-tracking branch 'upstream/develop' into imageGrid
authortobiasKaminsky <tobias@kaminsky.me>
Tue, 18 Nov 2014 17:08:28 +0000 (18:08 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Tue, 18 Nov 2014 17:08:28 +0000 (18:08 +0100)
commit4867bb32c3a1d4fcafa7b557247f34ef4564fa03
treefb8f2d049cfeede6e58e4a3a6fd75ded49fb1666
parent65c78a44c8e24df766005e49feaf952345a31248
parentd3bfbb856805d4c988fcfed85d760ba511658da9
Merge remote-tracking branch 'upstream/develop' into imageGrid

Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
res/values-fr/strings.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java