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/Token | |
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/Token')
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Token/Comment.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Token/Empty.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Token/End.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Token/Start.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Token/Tag.php | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Token/Text.php | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/library/HTMLPurifier/Token/Comment.php b/library/HTMLPurifier/Token/Comment.php index dc6bdcabb..dc6bdcabb 100755..100644 --- a/library/HTMLPurifier/Token/Comment.php +++ b/library/HTMLPurifier/Token/Comment.php diff --git a/library/HTMLPurifier/Token/Empty.php b/library/HTMLPurifier/Token/Empty.php index 2a82b47ad..2a82b47ad 100755..100644 --- a/library/HTMLPurifier/Token/Empty.php +++ b/library/HTMLPurifier/Token/Empty.php diff --git a/library/HTMLPurifier/Token/End.php b/library/HTMLPurifier/Token/End.php index 353e79daf..353e79daf 100755..100644 --- a/library/HTMLPurifier/Token/End.php +++ b/library/HTMLPurifier/Token/End.php diff --git a/library/HTMLPurifier/Token/Start.php b/library/HTMLPurifier/Token/Start.php index e0e14fc62..e0e14fc62 100755..100644 --- a/library/HTMLPurifier/Token/Start.php +++ b/library/HTMLPurifier/Token/Start.php diff --git a/library/HTMLPurifier/Token/Tag.php b/library/HTMLPurifier/Token/Tag.php index 798be028e..798be028e 100755..100644 --- a/library/HTMLPurifier/Token/Tag.php +++ b/library/HTMLPurifier/Token/Tag.php diff --git a/library/HTMLPurifier/Token/Text.php b/library/HTMLPurifier/Token/Text.php index 82efd823d..82efd823d 100755..100644 --- a/library/HTMLPurifier/Token/Text.php +++ b/library/HTMLPurifier/Token/Text.php |