diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2016-01-27 10:34:55 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2016-01-27 10:34:55 +0000 |
| commit | b8083a462aebf542f6f39c4201e1f09248b7e0e7 (patch) | |
| tree | ab44be742664db2dd720efc03326db0acef22dde /perllib/FixMyStreet/App/Controller/Status.pm | |
| parent | ac59f93b2228f5ff77ca7b7aff6fc3be54d360cd (diff) | |
| parent | 5adabce92647a6b9e12887af7959efcfef4877d4 (diff) | |
Merge branch '1146-social-login'
Conflicts:
templates/web/base/report/new/fill_in_details_form.html
templates/web/base/report/update-form.html
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Status.pm')
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Status.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Status.pm b/perllib/FixMyStreet/App/Controller/Status.pm index 8a84a1666..931c7bd47 100755 --- a/perllib/FixMyStreet/App/Controller/Status.pm +++ b/perllib/FixMyStreet/App/Controller/Status.pm @@ -3,7 +3,7 @@ use Moose; use namespace::autoclean; use HTTP::Negotiate; -use JSON; +use JSON::MaybeXS; BEGIN { extends 'Catalyst::Controller'; } |