Merge branch 'master' into css-feedtree-counter

Conflicts:
	tt-rss.css

1 files changed, 0 insertions, 31 deletions

diff --git a/plugins/example_article/init.php b/plugins/example_article/init.php
deleted file mode 100644
index 05f95a40a..000000000
--- a/plugins/example_article/init.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-class Example_Article extends Plugin {
-
-	private $link;
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Example plugin for HOOK_RENDER_ARTICLE",
-			"fox",
-			true);
-	}
-
-	function init($host) {
-		$this->link = $host->get_link();
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_RENDER_ARTICLE, $this);
-	}
-
-	function get_prefs_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
-	}
-
-	function hook_render_article($article) {
-		$article["content"] = "Content changed: " . $article["content"];
-
-		return $article;
-	}
-}
-?>