natto1784/aslichan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflict

Browse Source
This commit is contained in:
ctrlcctrlv
2013-08-11 15:36:17 +00:00
parent efebd30221 aeb33169ea
commit b9ec342750
6 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inc/config.php
View File

@@ -624,7 +624,7 @@
// Oh, and add jQuery in additional_javascript.
$config['attention_bar'] = false;
// Allow html in board subtitle. This is useful for placing icons and links.
// Allow unfiltered HTML in board subtitle. This is useful for placing icons and links.
$config['allow_subtitle_html'] = false;
/*
@@ -718,6 +718,9 @@
// array('status' => 'http://status.example.org/')
// );
// Whether or not to put brackets around the whole board list
$config['boardlist_wrap_bracket'] = false;
// Board categories. Only used in the "Categories" theme.
// $config['categories'] = array(
// 'Group Name' => array('a', 'b', 'c'),
@@ -744,8 +747,9 @@
// 'bottom' => '',
// );
// Optional message to display on ban pages. For example, you could include a link to email an admin or join an IRC channel to be unbanned.
$config['ban_page_message'] = '';
// Optional HTML to append to "You are banned" pages. For example, you could include instructions and/or
// a link to an email address or IRC chat room to appeal the ban.
$config['ban_page_extra'] = '';
/*
* ====================