Oliver Gorwits 97d1232860 Merge branch 'master' into em-device-ports-json ...

Conflicts:
	Netdisco/share/public/css/netdisco.css
	Netdisco/share/views/ajax/device/ports.tt

2014-09-16 19:29:41 +01:00

..

environments

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

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

public

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

2014-09-16 19:29:41 +01:00

views

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

2014-09-16 19:29:41 +01:00

config.yml

better format for table page sizes

2014-09-16 18:42:46 +01:00