]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 26 Mar 2012 06:51:40 +0000 (02:51 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 26 Mar 2012 06:51:40 +0000 (02:51 -0400)
* 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:


Trivial merge