Merge branch 'master' into em-device-ports-json
Conflicts: Netdisco/share/public/css/netdisco.css Netdisco/share/views/ajax/device/ports.tt
This commit is contained in:
@@ -657,6 +657,7 @@ form .clearfix.success input {
|
||||
}
|
||||
|
||||
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
|
||||
/* dataTables */
|
||||
|
||||
/* Clear div for DataTables ColVis plugin */
|
||||
div.nd_clear-both {
|
||||
|
||||
Reference in New Issue
Block a user