projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 968c535)
Merge branch 'develop' into loging_different_servers_same_pattern
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Apr 2015 07:35:37 +0000 (09:35 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Apr 2015 07:35:37 +0000 (09:35 +0200)
Conflicts SOLVED in:
src/com/owncloud/android/ui/activity/FileActivity.java


No differences found
ownCloud Android App