aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-28 05:42:47 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-28 05:42:47 -0400
commit6bb8d42865fcd19d17e36252e1d668b1467c1d46 (patch)
tree229e30eecd81ef208bd608c89fc152e13bd6b30a
parent7fc57f486fb91da67c190ef8563d872a3570ded6 (diff)
downloadvolse-hubzilla-6bb8d42865fcd19d17e36252e1d668b1467c1d46.tar.gz
volse-hubzilla-6bb8d42865fcd19d17e36252e1d668b1467c1d46.tar.bz2
volse-hubzilla-6bb8d42865fcd19d17e36252e1d668b1467c1d46.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: support autocomplete @-tags in plaintext mode vier navbar messed up after default theme template move profile_tabs hook use theme directory for page templates, not language directory turn on gecko spellcheck in tinymce small fix in diabook fixes in diabook provide a close-option for boxes in right_aside and store info via js and cookies provide a close-option for boxes in right_aside and store info via js and cookies form security error when using existing photo * master:
0 files changed, 0 insertions, 0 deletions