Merge branch 'new-messaging' into staging

2017-08-25 14:42:34 +02:00
parent 9e04d039d7 22d754d514
commit 57d0c6c973
13 changed files with 1449 additions and 10 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -98,6 +98,7 @@ define([
    common.createRandomInteger = Util.createRandomInteger;
    common.getAppType = Util.getAppType;
    common.notAgainForAnother = Util.notAgainForAnother;
+    common.uid = Util.uid;

    // import hash utilities for export
    var createRandomHash = common.createRandomHash = Hash.createRandomHash;