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 /db | |
| 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 'db')
| -rwxr-xr-x | db/rerun_dbic_loader.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/rerun_dbic_loader.pl b/db/rerun_dbic_loader.pl index 1261f2378..152d319b1 100755 --- a/db/rerun_dbic_loader.pl +++ b/db/rerun_dbic_loader.pl @@ -30,7 +30,7 @@ make_schema_at( overwrite_modifications => 1, # don't worry that the md5 is wrong # add in some extra components - components => [ 'FilterColumn', 'InflateColumn::DateTime' ], + components => [ 'FilterColumn', 'InflateColumn::DateTime', 'EncodedColumn' ], }, FixMyStreet->dbic_connect_info(), |