diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-28 05:29:03 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-28 05:29:03 -0400 |
commit | c661dc502f1ab4a6361faea1271d3c9a4aafa4ba (patch) | |
tree | 314fc610188bf5ebd06ef2fde4909c01b8b74561 /view/404.tpl | |
parent | 3bfa3f2a13f4e3b75b8e922eb3d946e1a31809b6 (diff) | |
parent | f163aed66d2aec038131131c68110043de36137a (diff) | |
download | volse-hubzilla-c661dc502f1ab4a6361faea1271d3c9a4aafa4ba.tar.gz volse-hubzilla-c661dc502f1ab4a6361faea1271d3c9a4aafa4ba.tar.bz2 volse-hubzilla-c661dc502f1ab4a6361faea1271d3c9a4aafa4ba.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
break up poller into separate processes
add tooltip title to common_tabs
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
Diabook-dark update, it's almost useable now (if you're lenient).
Added "important changes" to admin menu for admins who don't follow the github properly.
* master:
Diffstat (limited to 'view/404.tpl')
0 files changed, 0 insertions, 0 deletions