Merge branch 'master' into og-autoload

Conflicts:
	Netdisco/share/config.yml
This commit is contained in:
Oliver Gorwits
2014-07-01 21:50:01 +01:00
60 changed files with 124 additions and 70 deletions

View File

@@ -45,7 +45,7 @@ requires 'Plack::Middleware::Expires' => 0.03;
requires 'Role::Tiny' => 1.002005;
requires 'Socket6' => 0.23;
requires 'Starman' => 0.4008;
requires 'SNMP::Info' => 3.12;
requires 'SNMP::Info' => 3.16;
requires 'SQL::Translator' => 0.11016;
requires 'Template' => 2.24;
requires 'Template::Plugin::CSV' => 0.04;