diff options
author | zottel <github@zottel.net> | 2012-04-24 10:38:23 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-04-24 10:38:23 +0200 |
commit | 912e008ded3d439f7779310eb422e4b871a9b63d (patch) | |
tree | 61f1960c1ff17e27d0755e40ea7ccb90d0c0d4b1 /util/typo.php | |
parent | e6847cdd3f6faf087dc7e738e1dbae7d70113451 (diff) | |
parent | fbdb8fc43a3cb03f25102f15a1deaf8408e9122a (diff) | |
download | volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.gz volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.bz2 volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'util/typo.php')
-rw-r--r-- | util/typo.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/typo.php b/util/typo.php index e20cce86a..7c275f3ca 100644 --- a/util/typo.php +++ b/util/typo.php @@ -33,6 +33,8 @@ $files = glob($dir . '/*.php'); foreach($files as $file) { echo $file . "\n"; + if(stristr($file,'jappixmini/proxy.php')) + continue; include_once($file); } } |