Oliver Gorwits 95b6cb61b3 Merge branch 'master' into og-autoload ...

Conflicts:
	Netdisco/share/config.yml

2014-07-01 21:50:01 +01:00

..

environments

Ignore devices with "phone" in their CDP/LLDP platform description

2014-06-01 22:24:12 +01:00

public

css fixes

2014-06-30 22:49:49 +01:00

views

Merge branch 'master' into og-autoload

2014-07-01 21:50:01 +01:00

config.yml

Merge branch 'master' into og-autoload

2014-07-01 21:50:01 +01:00