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

Browse Source

* 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:

...

This commit is contained in:

Simon L'nu 2012-03-20 21:41:34 -04:00

parent ef33cfcc9a

commit be50cc03b8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available