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/request_classification.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/request_classification.rb')
| -rw-r--r-- | app/models/request_classification.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/request_classification.rb b/app/models/request_classification.rb index f5a1b4bee..6873d468b 100644 --- a/app/models/request_classification.rb +++ b/app/models/request_classification.rb @@ -1,9 +1,8 @@ # == Schema Information -# Schema version: 20120919140404 # # Table name: request_classifications # -# id :integer not null, primary key +# id :integer not null, primary key # user_id :integer # info_request_event_id :integer # created_at :datetime |