diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-27 15:02:24 +0100 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-27 15:02:24 +0100 |
commit | 928cb3401bfb70b6a48fe60b198b672b4062f23a (patch) | |
tree | a22601b8e97655fbb07eedce59441dab6a3e134b /program | |
parent | 297a74adf1fc246df15fc47f37e32b6458785f9f (diff) | |
parent | 63f130782c65c64daa8a51044e58a6a8471aa57a (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program')
-rw-r--r-- | program/lib/Roundcube/rcube_output.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_output.php b/program/lib/Roundcube/rcube_output.php index ca8d83ef3..4ef42f598 100644 --- a/program/lib/Roundcube/rcube_output.php +++ b/program/lib/Roundcube/rcube_output.php @@ -31,7 +31,7 @@ abstract class rcube_output protected $app; protected $config; - protected $charset = RCMAIL_CHARSET; + protected $charset = RCUBE_CHARSET; protected $env = array(); |