diff options
author | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
---|---|---|
committer | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
commit | b483a17c13ba8e273949ce4ee8c8c05e66b06647 (patch) | |
tree | 3e928fa68c3edb90c0666ec52ad8c9982f9dab77 /perllib/FixMyStreet/DB/Result/Comment.pm | |
parent | 8deb709fa2d44bcbaba54734f7f4f4385980d8df (diff) | |
parent | 62ffebc89cc66d32a828ea1de8c850c3e950faa1 (diff) |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/DB/Result/Comment.pm
perllib/FixMyStreet/DB/Result/User.pm
web/css/core.css
Diffstat (limited to 'perllib/FixMyStreet/DB/Result/Comment.pm')
-rw-r--r-- | perllib/FixMyStreet/DB/Result/Comment.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 76c96e581..9ed9d8b48 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -8,7 +8,7 @@ use warnings; use base 'DBIx::Class::Core'; -__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime"); +__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("comment"); __PACKAGE__->add_columns( "id", |