]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5ed016 beae00a)
Merge pull request #333 from nextcloud/sync-master
authorLukas Reschke <lukas@statuscode.ch>
Thu, 7 Jul 2016 17:29:43 +0000 (19:29 +0200)
committerGitHub <noreply@github.com>
Thu, 7 Jul 2016 17:29:43 +0000 (19:29 +0200)
Sync master

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

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