From 138f9aeb40a234359336333ebe3f18e0f0776b23 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Thu, 22 Jan 2015 08:04:12 +0000
Subject: [PATCH] Merge

---
 .gitignore      | 11 +++++++++++
 inc/api.php     |  1 +
 inc/display.php |  1 -
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5bc45780..8fecf08c 100644
--- a/.gitignore
+++ b/.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
diff --git a/inc/api.php b/inc/api.php
index 4e3f1c4f..bc271188 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -33,6 +33,7 @@ class Api {
 			'sticky' => 'sticky',
 			'locked' => 'locked',
 			'bump' => 'last_modified',
+			'embed' => 'embed',
 		);
 
 		$this->threadsPageFields = array(
diff --git a/inc/display.php b/inc/display.php
index a4628a77..89e32fed 100644
--- a/inc/display.php
+++ b/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);
 			}