diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-30 08:17:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-30 08:17:40 -0400 |
| commit | c5cb208cb8ac0968bebb416bad5b37b029ccd239 (patch) | |
| tree | ed6b45a0eb824bafd5dd28131a910134039052ec | |
| parent | b5e292509efa8dffd375e6ba76c331752f86108c (diff) | |
| download | volse-hubzilla-c5cb208cb8ac0968bebb416bad5b37b029ccd239.tar.gz volse-hubzilla-c5cb208cb8ac0968bebb416bad5b37b029ccd239.tar.bz2 volse-hubzilla-c5cb208cb8ac0968bebb416bad5b37b029ccd239.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* 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:
0 files changed, 0 insertions, 0 deletions