diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-20 21:41:34 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-20 21:41:34 -0400 |
| commit | be50cc03b8b997a3b073c3627f371bd16b82eaa5 (patch) | |
| tree | e680fa5fe39744ceca09c2aeb2c774975919931a /library/tinymce/jscripts | |
| parent | ef33cfcc9a30b7e457c94d772a520162cd6b7a35 (diff) | |
| download | volse-hubzilla-be50cc03b8b997a3b073c3627f371bd16b82eaa5.tar.gz volse-hubzilla-be50cc03b8b997a3b073c3627f371bd16b82eaa5.tar.bz2 volse-hubzilla-be50cc03b8b997a3b073c3627f371bd16b82eaa5.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
move friend suggestions to top of contact page, add default contact profile photos if missing
missed a default profile photo replacement in notifications
change default profile photo to something more interesting than a reddish brown square
slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible
* master:
Diffstat (limited to 'library/tinymce/jscripts')
0 files changed, 0 insertions, 0 deletions