Merge branch 'dev' of https://github.com/ntop/ntopng into dev

This commit is contained in:
gabryon99 2020-02-13 17:44:21 +01:00
commit a5f6ae3b8d
37 changed files with 1409 additions and 102 deletions

View file

@ -165,7 +165,6 @@ print [[
]]
if not ntop.isnEdge() then
print[[
<label for="user_language">]] print(i18n("language")) print[[</label>
<div class='input-group mb-6'>
@ -181,7 +180,6 @@ print[[
</select>
</div>
<br>]]
end
print[[
<div class="form-group col-md-12 has-feedback">