Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 2018-01-23 14:36:20 +01:00
commit 492fcf0bb6
1 changed files with 7 additions and 3 deletions

View File

@ -387,11 +387,15 @@ export type ChainPadServer_Storage_t = {
getChannelMetadata: (channelName:string, cb:(err:?Error|string, data:?any)=>void)=>void,
clearChannel: (channelName:string, (err:?Error)=>void)=>void
};
const flow_Config = require('../config.example.js');
type Config_t = typeof(flow_Config);
export type ChainPadServer_Config_t = {
verbose?: boolean,
filePath?: string,
channelExpirationMs?: number,
openFileLimit?: number
};
*/
module.exports.create = function (
conf /*:Config_t*/,
conf /*:ChainPadServer_Config_t*/,
cb /*:(store:ChainPadServer_Storage_t)=>void*/
) {
var env = {