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/Printer | |
| 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/Printer')
| -rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Printer/CSSDefinition.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Printer/ConfigForm.css | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Printer/ConfigForm.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Printer/ConfigForm.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/Printer/HTMLDefinition.php | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/library/HTMLPurifier/Printer/CSSDefinition.php b/library/HTMLPurifier/Printer/CSSDefinition.php index 81f986590..81f986590 100755..100644 --- a/library/HTMLPurifier/Printer/CSSDefinition.php +++ b/library/HTMLPurifier/Printer/CSSDefinition.php diff --git a/library/HTMLPurifier/Printer/ConfigForm.css b/library/HTMLPurifier/Printer/ConfigForm.css index 3ff1a88aa..3ff1a88aa 100755..100644 --- a/library/HTMLPurifier/Printer/ConfigForm.css +++ b/library/HTMLPurifier/Printer/ConfigForm.css diff --git a/library/HTMLPurifier/Printer/ConfigForm.js b/library/HTMLPurifier/Printer/ConfigForm.js index cba00c9b8..cba00c9b8 100755..100644 --- a/library/HTMLPurifier/Printer/ConfigForm.js +++ b/library/HTMLPurifier/Printer/ConfigForm.js diff --git a/library/HTMLPurifier/Printer/ConfigForm.php b/library/HTMLPurifier/Printer/ConfigForm.php index 02aa65689..02aa65689 100755..100644 --- a/library/HTMLPurifier/Printer/ConfigForm.php +++ b/library/HTMLPurifier/Printer/ConfigForm.php diff --git a/library/HTMLPurifier/Printer/HTMLDefinition.php b/library/HTMLPurifier/Printer/HTMLDefinition.php index 8a8f126b8..8a8f126b8 100755..100644 --- a/library/HTMLPurifier/Printer/HTMLDefinition.php +++ b/library/HTMLPurifier/Printer/HTMLDefinition.php |