diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
commit | a4927fc05a710cee6217d8a40ce925d5f894fd8f (patch) | |
tree | 83909e1d903afbf49d50182af79a679442632975 /lib/tmail_extensions.rb | |
parent | cc27fe66a13fe1504711c64ce5530a1c178e907d (diff) | |
parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) |
Merge branch 'release/0.6.7' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'lib/tmail_extensions.rb')
-rw-r--r-- | lib/tmail_extensions.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/tmail_extensions.rb b/lib/tmail_extensions.rb index f35565352..6a533e658 100644 --- a/lib/tmail_extensions.rb +++ b/lib/tmail_extensions.rb @@ -3,8 +3,7 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: tmail_extensions.rb,v 1.7 2009-10-02 23:31:01 francis Exp $ + require 'racc/parser' require 'tmail' require 'tmail/scanner' |