mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'contrib-agree'

Browse Source 
Conflicts:
	AUTHORS.md
This commit is contained in:
barryodonovan
2016-10-20 14:12:17 +01:00
parent c1779f055f e525da012f
commit eca129b4dc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS.md
View File

@ -141,7 +141,11 @@ LibreNMS contributors:
- Karl Shea <karl@karlshea.com> (karlshea)
- Justin Settle <jus10@partlycloudy.org> (jquagga)
- Alexander Kratzsch <klump@devrandom.se> (klump)
<<<<<<< HEAD
- Joseph Eames <j.eames@outlook.com> (j-ems)
=======
- Barry O'Donovan barry.odonovan@lightnet.ie (barryodonovan)
>>>>>>> contrib-agree
[1]: http://observium.org/ "Observium web site"
Observium was written by: