diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 | 
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 | 
| commit | d8deb8418b4cd26c68eb1301959e156c19b111e2 (patch) | |
| tree | 99c346db95d17be9c5105ce47d5f3ac8e943e952 /app/models/purge_request.rb | |
| parent | 8459314b691f5b02277035219cd58f510d100a77 (diff) | |
| parent | 75542416a1cc36b353ade557b1bc4f729b02423a (diff) | |
Merge branch 'release/0.14'0.14
Conflicts:
    locale/bg/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/it/app.po
    locale/nb_NO/app.po
    locale/pl/app.po
    locale/sv/app.po
    locale/vi/app.po
Diffstat (limited to 'app/models/purge_request.rb')
| -rw-r--r-- | app/models/purge_request.rb | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/app/models/purge_request.rb b/app/models/purge_request.rb index e48f3cc6f..4e6267bd2 100644 --- a/app/models/purge_request.rb +++ b/app/models/purge_request.rb @@ -1,13 +1,12 @@  # == Schema Information -# Schema version: 114  #  # Table name: purge_requests  # -#  id         :integer         not null, primary key +#  id         :integer          not null, primary key  #  url        :string(255) -#  created_at :datetime        not null -#  model      :string(255)     not null -#  model_id   :integer         not null +#  created_at :datetime         not null +#  model      :string(255)      not null +#  model_id   :integer          not null  #  # models/purge_request.rb:  | 
