]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into improve_app-management
authorkondou <kondou@ts.unde.re>
Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)
committerkondou <kondou@ts.unde.re>
Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)
commit0ce35af02acb2fa9fe0ef401dc75345b5114e3d6
tree5ff19a7cc1bce5901cfeec7e11179ed2682b9e78
parent7c296a6cf915da6630422ceb8e253ebf9f004964
parenta89199cc7bd19f6ba3e76fcd510219b2bd930ae6
Merge branch 'master' into improve_app-management

Conflicts:
settings/js/apps.js
core/css/styles.css
lib/app.php
lib/installer.php