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

2017-03-03 18:14:59 +01:00
parent 2a1b241592 bf82704def
commit f61f284e44
3 changed files with 19 additions and 18 deletions
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -1,9 +1,8 @@
 define([
    '/customize/application_config.js',
    '/common/cryptpad-common.js',
-    '/bower_components/lil-uri/uri.min.js',
    '/bower_components/jquery/dist/jquery.min.js',
-], function (Config, Cryptpad, LilUri) {
+], function (Config, Cryptpad) {
    var $ = window.$;

    var APP = window.APP = {