diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
| commit | 4419e43f7f62d92f01ba8f844aa9cd472051dd84 (patch) | |
| tree | 4c80501a0306c1cddd2427685824bef62683020b /lib/action.php | |
| parent | 6f95ccd37de1f7e2063206e87c93cbe06097eae7 (diff) | |
| parent | f2fd8b36f4a932f50770c84d769297bcfc1c1483 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/action.php b/lib/action.php index a2638993f..e50397514 100644 --- a/lib/action.php +++ b/lib/action.php @@ -1007,7 +1007,7 @@ class Action extends HTMLOutputter // lawsuit if ($this->isCacheable()) { header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); header( "Cache-Control: private, must-revalidate, max-age=0" ); - header( "Pragma: underwear-catapult"); + header( "Pragma:"); } } |