Oliver Gorwits 7f2a9b7c3b Merge branch 'master' into em-device-ports-json ...

Conflicts:
	Netdisco/share/views/ajax/datatabledefaults.tt

2014-11-16 22:41:02 +00:00

..

environments

New backend daemon code, no SQLite. MCE::Flow.

2014-08-10 21:34:46 +01:00

public

save sidebar settings when Update View; fix bugs

2014-11-01 12:26:04 +00:00

views

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

2014-11-16 22:41:02 +00:00

config.yml

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

2014-11-16 21:59:35 +00:00