Merge remote-tracking branch 'upstream/development' into development

This commit is contained in:
Patrick O'Brien 2017-03-27 13:38:19 -04:00
commit 24868fdb2b

View file

@ -48,6 +48,7 @@ if($uri == "/")
?>
<!DOCTYPE html>
<html>
<head>
<meta charset='UTF-8'/>
<title>Website Blocked</title>