From d92bab669331098b1ad7cd435c2fa6582ddab5f0 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 17 Apr 2012 13:17:13 -0400
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  update to the German string files
  diabook-themes: removed fpostit due to security issues and small fix in german translation
  naked br appearing when attaching and textplain
  Some Bugfixes, and variable checks
  rev update

* master:

From f4ff75caced19c7af5f9094fd42a92302555c5f9 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 17 Apr 2012 13:21:30 -0400
Subject: [PATCH 2/2] [SECURITY] finish ripping out fpostit

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/communityhome.tpl | 5 -----
 view/theme/dispy/communityhome.tpl      | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
index df8bbad7c..4d09b9255 100644
--- a/view/theme/dispy-dark/communityhome.tpl
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -37,8 +37,3 @@
 </div>
 {{ endif }}
 
-<h3 id="postit-header">'PostIt' to Friendica</h3>
-<div id="postit">
-<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
-</div>
-
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index df8bbad7c..4d09b9255 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -37,8 +37,3 @@
 </div>
 {{ endif }}
 
-<h3 id="postit-header">'PostIt' to Friendica</h3>
-<div id="postit">
-<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
-</div>
-