Merge branch 'newtoolbar' into hpbs

2017-01-19 10:53:55 +01:00
commit fa8a0d5880
@@ -652,7 +652,7 @@ define([
        });

        var config = {
-            displayed: ['useradmin', 'language', 'spinner', 'lag', 'state', 'share', 'userlist'],
+            displayed: ['useradmin', 'language', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad'],
            userData: userData,
            readOnly: readOnly,
            title: {