Merge remote-tracking branch 'upstream/master'

Conflicts:
	AUTHORS.md
This commit is contained in:
joeywas
2016-08-30 15:30:40 -07:00
24 changed files with 31788 additions and 12 deletions

View File

@@ -9,7 +9,7 @@ We have some pre-built VirtualBox images you can use to get started:
If you want to install yourself then we have some new documentation which should make it easy.
> Please note the following docs are new and may not be 100% complate, please provide feedback on your experience.
> Please note the following docs are new and may not be 100% complete, please provide feedback on your experience.
[Ubuntu 16.04 Apache](http://docs.librenms.org/Installation/Installation-Ubuntu-1604-Apache/)