projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 802a164)
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)
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


No differences found
ownCloud Android App