]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into oc_avatars
authorkondou <kondou@ts.unde.re>
Thu, 12 Sep 2013 05:41:44 +0000 (07:41 +0200)
committerkondou <kondou@ts.unde.re>
Thu, 12 Sep 2013 05:41:44 +0000 (07:41 +0200)
commitc9c5e1b97f2c5951dffc8104e22a315654780118
tree6b4a67fe094bea99facab6883c774c611b8f7b80
parent037cf22c518b6f3e6a462577c49159a1fae2442d
parentb7205d97d7797daf057d47a5a07d2bad3b0db4da
Merge branch 'master' into oc_avatars
core/routes.php
lib/base.php
settings/js/personal.js