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

Browse Source

* remotes/upstream/master:
  Oops - but lets commit the right revision, sorry.  There's a spare line in the last one.
  Fix darkzero/ns BB icon background colours.
  cause of bogus wall-to-wall posts found
  add queue totals to admin summary page
  DE: update to the strings and some mail templates
  fix setting array values to config items
  redir links for permission controlled attachments

* master:

...

This commit is contained in:

Simon L'nu 2012-05-22 19:49:03 -04:00

parent b962559570

commit e56af0e09e

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