merge fixes

This commit is contained in:
zadam
2021-05-08 11:20:20 +02:00
parent 051b9dff21
commit 2edc7dbf58
5 changed files with 577 additions and 10626 deletions

View File

@@ -12,7 +12,6 @@ const sqlInit = require('../../services/sql_init');
const sql = require('../../services/sql');
const optionService = require('../../services/options');
const ApiToken = require('../../services/becca/entities/api_token.js');
const ApiToken = require('../../entities/api_token');
const ws = require("../../services/ws.js");
function loginSync(req) {