]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80a8b9c e0547a2)
Merge pull request #3223 from owncloud/fix-2820
authorMorris Jobke <morris.jobke@gmail.com>
Mon, 1 Jul 2013 08:28:17 +0000 (01:28 -0700)
committerMorris Jobke <morris.jobke@gmail.com>
Mon, 1 Jul 2013 08:28:17 +0000 (01:28 -0700)
if rename of file fails, the rename is undone in the view - fix 2820

1  2 
apps/files/js/filelist.js patch | diff1 | diff2 | blob | history
core/js/js.js patch | diff1 | diff2 | blob | history

diff --cc apps/files/js/filelist.js
Simple merge
diff --cc core/js/js.js
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server