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

2017-09-13 14:52:26 +02:00
parent dc86579d46 0d8c292fef
commit 8a87ec180e
23 changed files with 73 additions and 33 deletions
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -5,7 +5,7 @@ define([
    '/common/test.js',
    '/common/credential.js', // preloaded for login.js

-    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
    'less!/customize/src/less/loading.less',
 ], function ($, Login, Cryptpad, Test, Cred) {
    var Messages = Cryptpad.Messages;