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

Browse source

* remotes/upstream/master:
  quattro-green: adopted quattro option for centered display
  string update
  add themes diabook-red & diabook-aerith
  rename "file as" to "save to folder"
  bug #352 - qcomment plugin disabled, qcomments still allowed
  quattro-greey: apply theming to private mail
  zrl into people searches
  another silly mistake
  silly mistake
  zrl on mentions
  use zrl to get home again
  provide a way to specify an admin account for siteinfo if more than one have admin email address

* master:

...

This commit is contained in:

Simon L'nu 2012-03-30 08:17:40 -04:00

parent b5e292509e

commit c5cb208cb8

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 is not available