Merge branch 'fontawesome' into soon

2016-09-29 14:52:48 +02:00
parent 921ee128bc f03018f3bc
commit bc73fa2074
18 changed files with 72 additions and 129 deletions
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -689,8 +689,6 @@ define([

        var $toolbar = $('#toolbar');

-        $toolbar.find('sub a').text(Messages.backToCryptpad);
-
        var Button = function (opt) {
            return $('<button>', opt);
        };