Merge branch 'accounts' into staging

This commit is contained in:
yflory 2020-09-21 15:48:28 +02:00
commit 5ea1654810
3 changed files with 5 additions and 0 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
datastore
tasks
www/bower_components/*
www/accounts
node_modules
/config.js
customization

View File

@ -15,6 +15,7 @@ www/common/onlyoffice/v2*
server.js
www/common/old-media-tag.js
www/scratch
www/accounts
www/lib
www/accounts

View File

@ -1281,6 +1281,9 @@ define([
cb(null, $container);
return {
$container: $container,
update: function () {
common.getPinUsage(teamId, todo);
},
stop: function () {
clearInterval(interval);
}