aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/head.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-20 14:33:15 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-20 14:33:15 -0400
commit18d4cf05833574173f1645e40e68f2c9c775517e (patch)
tree3eefeaf641e91416fa7b43b9a36b829f28ff1983 /view/theme/dispy/head.tpl
parentf48de791813a914d7ce2e1ec00ba041657f3f8ac (diff)
parentf16a1199408d167bbc7c52dc408ef02b36808317 (diff)
downloadvolse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.tar.gz
volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.tar.bz2
volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: search with leading @ performs directory search (# for tag search), nothing for text search Darkzero-NS + 'Friendicaland' countries. set comment permissions explicitly to parent permissions * master:
Diffstat (limited to 'view/theme/dispy/head.tpl')
0 files changed, 0 insertions, 0 deletions