]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into hide_remove_image_avatar
authorkondou <kondou@ts.unde.re>
Fri, 28 Feb 2014 18:28:29 +0000 (19:28 +0100)
committerkondou <kondou@ts.unde.re>
Fri, 28 Feb 2014 18:28:29 +0000 (19:28 +0100)
1  2 
settings/js/personal.js

Simple merge