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:
Oliver Gorwits
2014-09-16 19:29:41 +01:00
66 changed files with 936 additions and 320 deletions

View File

@@ -657,6 +657,7 @@ form .clearfix.success input {
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* dataTables */
/* Clear div for DataTables ColVis plugin */
div.nd_clear-both {