Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Conflicts:
	js/quick-reply.js
This commit is contained in:
czaks 2013-09-18 09:00:22 -04:00
commit 99a2e1cf3d
6 changed files with 450 additions and 339 deletions

View file

@ -775,6 +775,7 @@ if (isset($_POST['delete'])) {
header('Content-Type: text/json; charset=utf-8');
echo json_encode(array(
'redirect' => $redirect,
'noko' => $config['always_noko'] || $noko,
'id' => $id
));
}