diff options
| author | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
| commit | 59395b3bdf19aed7bf5f77656afa6c31dad7e138 (patch) | |
| tree | b6e4c9f9e5b4a9f792a550ce3af727ae32b1cba1 /app/controllers/general_controller.rb | |
| parent | 452ac41f05f655a9fd23c8df4796f26632c23050 (diff) | |
| parent | da2c0aaf5f0d07baa3a355033a92d5dd295f2f13 (diff) | |
Merge branch 'master' into francis-profile-photo
Conflicts:
app/views/user/show.rhtml
commonlib
spec/controllers/user_controller_spec.rb
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 5c4103616..efab26fad 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -7,7 +7,7 @@ # # $Id: general_controller.rb,v 1.57 2009-10-03 10:23:43 francis Exp $ -require 'xmlsimple' +require 'lib/xmlsimple' require 'open-uri' class GeneralController < ApplicationController |