[Merge] 合并标签功能

This commit is contained in:
ibuler
2018-01-26 15:49:09 +08:00
28 changed files with 760 additions and 231 deletions

View File

@@ -30,7 +30,7 @@
<th class="text-center">{% trans 'Addr' %}</th>
<th class="text-center">{% trans 'SSH port' %}</th>
<th class="text-center">{% trans 'Http port' %}</th>
<th class="text-center">{% trans 'Sessions' %}</th>
<th class="text-center">{% trans 'Session' %}</th>
<th class="text-center">{% trans 'Active' %}</th>
<th class="text-center">{% trans 'Alive' %}</th>
<th class="text-center">{% trans 'Action' %}</th>