Merge branch 'master' of github.com:savetheinternet/Tinyboard

Conflicts:
	inc/config.php
	inc/functions.php
	post.php

1 files changed, 3 insertions, 0 deletions

diff --git a/test.php b/test.php
index 0cab3ac6..73a4a0d8 100644
--- a/test.php
+++ b/test.php
@@ -4,6 +4,9 @@
 	require 'inc/functions.php';

 	require 'inc/display.php';

 	require 'inc/template.php';

+	if (file_exists('inc/instance-config.php')) {

+		require 'inc/instance-config.php';

+	}

 	require 'inc/config.php';

 	require 'inc/user.php';