diff options
| author | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
| commit | 64618741c17760fcb59647d74d1ccaff56160b15 (patch) | |
| tree | d84f1f035b136180f0bdacb22895fbb0f1abf2c1 /app/models/user.rb | |
| parent | 96b3b5adbdafb25e5ab6ca94b89d6682a2e8f0e4 (diff) | |
| parent | cda26c36f309cdd8e8bbab9186f6cc0d4876e6c9 (diff) | |
Merge branch 'release/0.15' into wdtk
Conflicts:
lib/tasks/stats.rake
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d7c1c854e..2c4f87944 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -20,8 +20,6 @@ # email_bounce_message :text default(""), not null # no_limit :boolean default(FALSE), not null # receive_email_alerts :boolean default(TRUE), not null -# address :string(255) -# dob :date # require 'digest/sha1' |