mirror of https://github.com/xwiki-labs/cryptpad
Merge branch 'accounts' into staging
This commit is contained in:
commit
5ea1654810
|
@ -1,6 +1,7 @@
|
|||
datastore
|
||||
tasks
|
||||
www/bower_components/*
|
||||
www/accounts
|
||||
node_modules
|
||||
/config.js
|
||||
customization
|
||||
|
|
|
@ -15,6 +15,7 @@ www/common/onlyoffice/v2*
|
|||
server.js
|
||||
www/common/old-media-tag.js
|
||||
www/scratch
|
||||
www/accounts
|
||||
www/lib
|
||||
www/accounts
|
||||
|
||||
|
|
|
@ -1281,6 +1281,9 @@ define([
|
|||
cb(null, $container);
|
||||
return {
|
||||
$container: $container,
|
||||
update: function () {
|
||||
common.getPinUsage(teamId, todo);
|
||||
},
|
||||
stop: function () {
|
||||
clearInterval(interval);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue