Merge branch 'issue-386-v3' of git://github.com/BarbarossaTM/librenms

Conflicts:
	sql-schema/099.sql
This commit is contained in:
f0o
2016-02-07 15:23:52 +00:00
7 changed files with 70 additions and 33 deletions

1
sql-schema/100.sql Normal file
View File

@@ -0,0 +1 @@
INSERT INTO port_association_mode (name) values ('ifAlias');