Merge branch 'master' into master

This commit is contained in:
Marcin Łojewski
2017-12-21 12:09:40 +01:00
committed by GitHub
8 changed files with 182 additions and 12 deletions

View File

@@ -22,10 +22,13 @@
*/
require_once __DIR__ . '/../user_sql.php';
require_once __DIR__ . '/../group_sql.php';
\OCP\App::registerAdmin('user_sql','settings');
$backend = new \OCA\user_sql\OC_USER_SQL;
$group_backend = new \OCA\user_sql\OC_GROUP_SQL;
// register user backend
\OC_User::useBackend($backend);
\OC::$server->getGroupManager()->addBackend($group_backend);

View File

@@ -15,5 +15,6 @@
<category>auth</category>
<dependencies>
<nextcloud min-version="12" max-version="12"/>
<owncloud min-version="10" max-version="10"/>
</dependencies>
</info>