Merge branch 'master' into em-device-ports-json

This commit is contained in:
Oliver Gorwits
2014-11-13 21:35:41 +00:00

View File

@@ -42,7 +42,7 @@ $(document).ready(function() {
return he.encode(data || '');
}
}
].
],
[% INCLUDE 'ajax/datatabledefaults.tt' -%]
});
});