]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6faec0 62eeac3)
Merge branch 'master' into split_personal-user_passwordchange
authorkondou <kondou@ts.unde.re>
Wed, 11 Sep 2013 14:35:55 +0000 (16:35 +0200)
committerkondou <kondou@ts.unde.re>
Wed, 11 Sep 2013 14:35:55 +0000 (16:35 +0200)
1  2 
settings/js/personal.js patch | diff1 | diff2 | blob | history

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