Merge branch 'develop' into pinEnhancement
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 28 Apr 2015 12:20:17 +0000 (14:20 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 28 Apr 2015 12:20:17 +0000 (14:20 +0200)
commit802a1646160051a507853ef09e680139833fb142
tree44a68679590f712306881b64b959fcb3cf14c5f6
parentbceecf9d176d829177ace887c8468f07dc1aeb4d
parent3489fa1ccb3bdea8b86960be6e267d58d62b0ddd
Merge branch 'develop' into pinEnhancement

Conflicts SOLVED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/PinCodeActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java