Merge branch 'develop' into navigation_drawer
authormasensio <masensio@solidgear.es>
Thu, 21 May 2015 07:46:59 +0000 (09:46 +0200)
committermasensio <masensio@solidgear.es>
Thu, 21 May 2015 07:46:59 +0000 (09:46 +0200)
commit5f2820355d53973f8c577516533fca069464a58b
tree5d8727c47296ffd1b1157efc05dd0500f3180bd7
parent25718e7992ac273156f58d679ffc2cf3dad0c3c3
parent288c148b51b951017a3a9b333797a7e8eeede38a
Merge branch 'develop' into navigation_drawer

Conflicts:
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java