aboutsummaryrefslogtreecommitdiffstats
path: root/view/profile-in-directory.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-26 02:51:40 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-26 02:51:40 -0400
commit629a66793c245d39ca47523a6fbc790fae0cbe3b (patch)
treee1714c8fca95087ff97a844688c40ade60c3b8ef /view/profile-in-directory.tpl
parent2147ffa48734e50c9df1ea91ce100bf5336eacc2 (diff)
parent37f02424f801b3132b75b39d4132f35025667a75 (diff)
downloadvolse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.gz
volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.bz2
volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.zip
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:
Diffstat (limited to 'view/profile-in-directory.tpl')
0 files changed, 0 insertions, 0 deletions