Merge branch 'master' into feature/redesign-prototype

# Conflicts:
#	.gitignore
#	.htconfig.php
#	.htconfig.php-dist
#	boot.php
#	include/dba.php
#	mod/health.php
#	util/htconfig.vagrant.php
This commit is contained in:
Hypolite Petovan 2017-04-20 22:33:41 -04:00
commit a8dc2e65f4
183 changed files with 496 additions and 832 deletions

View file

@ -263,4 +263,4 @@ function nuke_record($url) {
}
}
return;
}
}