diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-05-16 14:30:30 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-05-16 14:30:30 +0100 |
| commit | d9f3bd47a94116871893f0417e7c836400bb04eb (patch) | |
| tree | 1c140a6cb9ea3fd60dbf1532d2cb0bcfdaa703ad /perllib/FixMyStreet/DB.pm | |
| parent | 1ba0a33c9fa19f2fa46f16678785d1c90ed33eb0 (diff) | |
| parent | 194173589eed229567646cedfc0e32621d18f1e7 (diff) | |
Merge branch 'master' into bromley
Conflicts:
bin/send-reports
conf/crontab.ugly
conf/general.yml-example
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/DB/Result/Comment.pm
perllib/FixMyStreet/DB/Result/Open311conf.pm
perllib/FixMyStreet/DB/Result/Problem.pm
perllib/FixMyStreet/DB/Result/User.pm
templates/web/default/js/validation_strings.html
templates/web/fixmystreet/auth/sign_out.html
templates/web/fixmystreet/report/new/councils_text_all.html
web/cobrands/fixmystreet/_base.scss
Diffstat (limited to 'perllib/FixMyStreet/DB.pm')
| -rw-r--r-- | perllib/FixMyStreet/DB.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/DB.pm b/perllib/FixMyStreet/DB.pm index 18c8cc2ca..a1767abe9 100644 --- a/perllib/FixMyStreet/DB.pm +++ b/perllib/FixMyStreet/DB.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB; # Created by DBIx::Class::Schema::Loader @@ -10,8 +11,9 @@ use base 'DBIx::Class::Schema'; __PACKAGE__->load_namespaces; -# Created by DBIx::Class::Schema::Loader v0.07009 @ 2011-03-01 15:43:43 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tJZ+CpaAfZVPrctDXTZTuQ + +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CjFpUvon7KggFM7OF7VK/w # You can replace this text with custom code or comments, and it will be preserved on regeneration 1; |