Peters Git server - pub/Android/ownCloud.git/commit

author	tobiasKaminsky <tobias@kaminsky.me>
	Mon, 19 Jan 2015 20:02:37 +0000 (21:02 +0100)
committer	tobiasKaminsky <tobias@kaminsky.me>
	Mon, 19 Jan 2015 20:02:37 +0000 (21:02 +0100)
commit	d4e0f3bdb1704ca6a12d6a4a6767efdf01ba7eed
tree	5e334e19e608171d98d42e886711e1c469d2f015	tree \| snapshot (tar.gz tar.bz2 zip)
parent	6d5c6f86e5fa9a2edb51562d028554cbc49cdf93	commit \| diff

Merge branch 'develop2' into imageGrid2

Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.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

build.gradle		diff \| blob \| blame \| history
gradle/wrapper/gradle-wrapper.properties		diff \| blob \| blame \| history
owncloud-android-library		diff \| blob \| blame \| history
res/values/dims.xml		diff \| blob \| blame \| history
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java		diff \| blob \| blame \| history
src/com/owncloud/android/utils/DisplayUtils.java		diff \| blob \| blame \| history