Merge

.gitignore

@@ -45,3 +45,14 @@ favicon.ico
 /static/spoiler.png
 
 /inc/locale/ja_JP/*
+
+#json
+/boards.json
+/boards-top20.json
+/8archive.json
+/tags.json
+
+#board specific files
+/*/main.js
+/*/rules.txt
+/stylesheets/board/*.css

inc/api.php

@@ -33,6 +33,7 @@ class Api {
 			'sticky' => 'sticky',
 			'locked' => 'locked',
 			'bump' => 'last_modified',
+			'embed' => 'embed',
 		);
 
 		$this->threadsPageFields = array(

inc/display.php

@@ -433,7 +433,6 @@ class Post {
 					'clean_local_mod_id' => null,
 					'clean_global_mod_id' => null,
 				);
-
 				if ($config['cache']['enabled'])
 					cache::set("post_clean_{$board['uri']}_{$this->id}", $this->clean);
 			}