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

2017-09-13 16:20:26 +02:00
parent ab64bf9e59 710418f42f
commit d360e2d0f4
34 changed files with 245 additions and 88 deletions
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -4,7 +4,7 @@ define([
    '/common/cryptpad-common.js',
    '/customize/pages.js',

-    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
 ], function ($, h, Cryptpad, Pages) {
 $(function () {
    var $body = $('body');