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:
This commit is contained in:
parent
7fc57f486f
commit
6bb8d42865