]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into improve_app-management
authorkondou <kondou@ts.unde.re>
Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)
committerkondou <kondou@ts.unde.re>
Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)
commitc741a25eaa64cbee65112ec83f0a4b196885daa3
tree12d6b5ebe08d31a45157f21083b2de6367cc19f9
parentb24b208dce41d11ace0295a93d4303c75ffa38d4
parentc427e256e1509453503140c0adacd3abcb7ef368
Merge branch 'master' into improve_app-management
lib/app.php
settings/js/apps.js