diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-07-05 12:17:57 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-07-05 12:17:57 +0100 |
| commit | 6d6614ddfd582e5cde0b55e76521c05b96fb906a (patch) | |
| tree | 09e2dba166b446e646b16e99181043ef26fa3741 /app/models/user.rb | |
| parent | b479373671365ba9377c23a8e984606ddab13330 (diff) | |
| parent | d30312f2d13b561bc0f596a8a57b4a944401600e (diff) | |
Merge branch 'develop' into wdtk
Conflicts:
doc/INSTALL.md
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index a21676f68..657ea2a4a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,4 @@ # == Schema Information -# Schema version: 114 # # Table name: users # @@ -21,9 +20,7 @@ # email_bounce_message :text default(""), not null # no_limit :boolean default(FALSE), not null # receive_email_alerts :boolean default(TRUE), not null -# user_similarity_id :integer # - # models/user.rb: # Model of people who use the site to file requests, make comments etc. # |