]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5d1dfc 934d9dc)
Merge branch 'master' into fixing-998-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 09:36:14 +0000 (10:36 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 09:36:14 +0000 (10:36 +0100)
1  2 
core/js/js.js patch | diff1 | diff2 | blob | history

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