diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-22 19:49:03 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-22 19:49:03 -0400 |
| commit | e56af0e09e0852c7215546d6f9db32ce5cc21b39 (patch) | |
| tree | 4b0ca3268d20b1905ada0dcf0c67b4cae6067592 | |
| parent | b962559570fe3a7381c7721a62989072661f01e9 (diff) | |
| download | volse-hubzilla-e56af0e09e0852c7215546d6f9db32ce5cc21b39.tar.gz volse-hubzilla-e56af0e09e0852c7215546d6f9db32ce5cc21b39.tar.bz2 volse-hubzilla-e56af0e09e0852c7215546d6f9db32ce5cc21b39.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* 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:
0 files changed, 0 insertions, 0 deletions