diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
commit | 43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (patch) | |
tree | 2f9d83d87682b16ac6ac949382ab566fdca48076 /library/HTMLPurifier/Lexer | |
parent | b361bcea83140c28b5a5677905405de0ac102791 (diff) | |
parent | afd2bf031eff688ae53e51f9199d025ca1935abe (diff) | |
download | volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.gz volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.bz2 volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
update to the German strings
add network_tabs hook
pass autoname(0) test
rev update
added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.
* master:
Diffstat (limited to 'library/HTMLPurifier/Lexer')
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Lexer/DOMLex.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Lexer/DirectLex.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Lexer/PEARSax3.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Lexer/PH5P.php | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/library/HTMLPurifier/Lexer/DOMLex.php b/library/HTMLPurifier/Lexer/DOMLex.php index 20dc2ed48..20dc2ed48 100755..100644 --- a/library/HTMLPurifier/Lexer/DOMLex.php +++ b/library/HTMLPurifier/Lexer/DOMLex.php diff --git a/library/HTMLPurifier/Lexer/DirectLex.php b/library/HTMLPurifier/Lexer/DirectLex.php index 456e6e190..456e6e190 100755..100644 --- a/library/HTMLPurifier/Lexer/DirectLex.php +++ b/library/HTMLPurifier/Lexer/DirectLex.php diff --git a/library/HTMLPurifier/Lexer/PEARSax3.php b/library/HTMLPurifier/Lexer/PEARSax3.php index 1d358c7b6..1d358c7b6 100755..100644 --- a/library/HTMLPurifier/Lexer/PEARSax3.php +++ b/library/HTMLPurifier/Lexer/PEARSax3.php diff --git a/library/HTMLPurifier/Lexer/PH5P.php b/library/HTMLPurifier/Lexer/PH5P.php index fa1bf973e..fa1bf973e 100755..100644 --- a/library/HTMLPurifier/Lexer/PH5P.php +++ b/library/HTMLPurifier/Lexer/PH5P.php |