aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-10-17 14:55:55 +0100
committerLouise Crow <louise.crow@gmail.com>2012-10-17 14:55:55 +0100
commite6dc0f6606b26e13cb0cd16124fdb2aad3c1b5a6 (patch)
treec376463aedff99886779eebf1da1ac5eb9da8370 /app/models/user.rb
parent6f804977c8dc790777af220f821bccb8a04e1be3 (diff)
Revert "Revert "Merge remote-tracking branch 'henare_github/patch-1'""
This reverts commit 211fe84dc40d97df8aa8724906d9170ed4f78477.
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 657ea2a4a..bb1b54d70 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,5 @@
# == Schema Information
+# Schema version: 20120919140404
#
# Table name: users
#
@@ -21,13 +22,6 @@
# no_limit :boolean default(FALSE), not null
# receive_email_alerts :boolean default(TRUE), not null
#
-# models/user.rb:
-# Model of people who use the site to file requests, make comments etc.
-#
-# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
-# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: user.rb,v 1.106 2009-10-01 01:43:36 francis Exp $
require 'digest/sha1'