diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-28 12:12:43 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-28 12:12:43 -0400 |
| commit | 4ae5589df791635549511a90b88422f24170694a (patch) | |
| tree | 1dbd867dc2f8aaf2736c087a080e11eaf704ac64 /library/HTMLPurifier/VarParser/Native.php | |
| parent | 4f488c7e3cf1a4bc12e83dfdd44ede32283140ac (diff) | |
| parent | 26156e1dc4d1f4948e847cd0e5e50304ef643b25 (diff) | |
| download | volse-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 'library/HTMLPurifier/VarParser/Native.php')
0 files changed, 0 insertions, 0 deletions