aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-06-28 12:12:43 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-06-28 12:12:43 -0400
commit4ae5589df791635549511a90b88422f24170694a (patch)
tree1dbd867dc2f8aaf2736c087a080e11eaf704ac64 /view/theme/dispy
parent4f488c7e3cf1a4bc12e83dfdd44ede32283140ac (diff)
parent26156e1dc4d1f4948e847cd0e5e50304ef643b25 (diff)
downloadvolse-hubzilla-4ae5589df791635549511a90b88422f24170694a.tar.gz
volse-hubzilla-4ae5589df791635549511a90b88422f24170694a.tar.bz2
volse-hubzilla-4ae5589df791635549511a90b88422f24170694a.zip
Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix logic for nested lists--should be OR, not AND
Diffstat (limited to 'view/theme/dispy')
0 files changed, 0 insertions, 0 deletions