diff options
| author | Michael Foster <savetheinternet@tinyboard.org> | 2013-08-21 22:36:48 +1000 |
|---|---|---|
| committer | Michael Foster <savetheinternet@tinyboard.org> | 2013-08-21 22:36:48 +1000 |
| commit | cbfafeea3636e222feb73cf42c24fec16bff71bd (patch) | |
| tree | d309127a3d89372e6ca0c94a49db5e4026cd4ebe /inc/functions.php | |
| parent | 9d77a4cc4c3a633f163d1e11a4e2ef775dbe95cc (diff) | |
merge fail
Diffstat (limited to 'inc/functions.php')
| -rw-r--r-- | inc/functions.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/inc/functions.php b/inc/functions.php index 98cf9d77..76865882 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1866,7 +1866,6 @@ function buildThread50($id, $return = false, $mod = false, $thread = null) { } else { file_write($board['dir'] . $config['dir']['res'] . sprintf($config['file_page50'], $id), $body); } ->>>>>>> a29a932... Make it possible to disable API, disable it by default } function rrmdir($dir) { |