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

This commit is contained in:
yflory 2018-07-19 17:52:07 +02:00
commit 362579f79f

View File

@ -32,7 +32,6 @@ define([
}); });
return select; return select;
}; };
languageSelector = languageSelector; // jshint
var footerCol = function (title, L, literal) { var footerCol = function (title, L, literal) {
return h('div.col-6.col-sm-3', [ return h('div.col-6.col-sm-3', [
@ -633,6 +632,7 @@ define([
]) ])
]), ]),
]), ]),
infopageFooter(),
]; ];
}; };