aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/user_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-03-28 10:29:48 +0000
committerLouise Crow <louise.crow@gmail.com>2013-03-28 10:29:48 +0000
commit12946b70d1c3097a930f13bb812a1e0db709dcb4 (patch)
treeef162d83f7a195b9bbcf9589278134b21775fa6c /app/controllers/user_controller.rb
parent98e937a21d58b4fe55f3fa2e443b21d5f7f41faa (diff)
parenta64188fb25263ca3066279bfe1a08fa20accae5d (diff)
Merge remote-tracking branch 'openaustralia_github/small_source_code_header_fixups' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
-rw-r--r--app/controllers/user_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 658daeeff..dca3cda17 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,7 +2,7 @@
# Show information about a user.
#
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
-# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
+# Email: hello@mysociety.org; WWW: http://www.mysociety.org/
require 'set'