Merge branch 'feature_previews' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 12 Apr 2013 10:46:18 +0000 (12:46 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 12 Apr 2013 10:46:18 +0000 (12:46 +0200)
commit56f1df02c440c2643e0f202ebe55147fe1660d60
tree5f1953bb1cfb6c4db4ae31d4145bb508c74b73fc
parent8aeb5243b70ad931aaef7b88b5f52f054cd4171b
parent2a42651463f9d82509a75b92a49884bdd7880ba1
Merge branch 'feature_previews' into develop

Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java