diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
| commit | 7d9b66d1ff31afa8d73ea1a81f4e612e41f89cb0 (patch) | |
| tree | 5206d9fbaf8d6af58bdaa35cefdfeb34a88c84ff /app/models/user_info_request_sent_alert.rb | |
| parent | 40a28fa2fe21d752a15c11938791d620dd31d17f (diff) | |
| parent | 8e7432be764254e6a50e6a06e77bb93bb5bba9fe (diff) | |
Merge branch 'release/0.14' into wdtk
Conflicts:
app/views/request/show.html.erb
Diffstat (limited to 'app/models/user_info_request_sent_alert.rb')
| -rw-r--r-- | app/models/user_info_request_sent_alert.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb index 449a4c237..098b773f8 100644 --- a/app/models/user_info_request_sent_alert.rb +++ b/app/models/user_info_request_sent_alert.rb @@ -1,12 +1,11 @@ # == Schema Information -# Schema version: 114 # # Table name: user_info_request_sent_alerts # -# id :integer not null, primary key -# user_id :integer not null -# info_request_id :integer not null -# alert_type :string(255) not null +# id :integer not null, primary key +# user_id :integer not null +# info_request_id :integer not null +# alert_type :string(255) not null # info_request_event_id :integer # |