From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 06:51:40 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=629a66793c245d39ca47523a6fbc790fae0cbe3b;p=friendica.git

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

* remotes/upstream/master:
  small fix
  don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
  position the theme-preview on settings page
  more wordsmithing of the Friendica invitation email
  screenshot gallery
  theme preview for end users

* master:
---

629a66793c245d39ca47523a6fbc790fae0cbe3b