From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 07:18:21 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=84686a26986e4d57093e48523b444dcd4f17c392;p=friendica.git

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

* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:
---

84686a26986e4d57093e48523b444dcd4f17c392