Merge branch 'accounts' into staging

pull/1/head
yflory 4 years ago
commit 5ea1654810

1
.gitignore vendored

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

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

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

Loading…
Cancel
Save