forked from GithubBackups/vichan
Conflicts: inc/config.php inc/display.php inc/mod/pages.php js/catalog-link.js post.php templates/banned.html
Conflicts: inc/config.php inc/display.php inc/mod/pages.php js/catalog-link.js post.php templates/banned.html