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:
commit
a8dc2e65f4
183 changed files with 496 additions and 832 deletions
|
|
@ -263,4 +263,4 @@ function nuke_record($url) {
|
|||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue