Conflicts:
	inc/config.php
	inc/functions.php
	templates/generic_page.html
	templates/index.html
This commit is contained in:
czaks 2013-08-03 19:05:25 -04:00
commit a0855cdcf5
22 changed files with 1304 additions and 1107 deletions

View file

@ -30,7 +30,7 @@
{% include 'post_form.html' %}
{% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %}
{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
<hr />
<form name="postcontrols" action="{{ config.post_url }}" method="post">
<input type="hidden" name="board" value="{{ board.uri }}" />