From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 15 Mar 2012 19:03:31 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1d2049a6d6fe327340da2b1298f06f9fbde183c7;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  more recycle fixes for plaintext
  fix recycle symbol when using plaintext editor
  add links to wall, photos, events, etc to aside on networkpage, fixes in css

* master:
---

1d2049a6d6fe327340da2b1298f06f9fbde183c7