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

1 files changed, 5 insertions, 6 deletions

diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index 66b8a5c47..d5e1cdb75 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -1,16 +1,15 @@
 # == Schema Information
-# Schema version: 114
 #
 # Table name: track_things
 #
-#  id               :integer         not null, primary key
-#  tracking_user_id :integer         not null
-#  track_query      :string(255)     not null
+#  id               :integer          not null, primary key
+#  tracking_user_id :integer          not null
+#  track_query      :string(255)      not null
 #  info_request_id  :integer
 #  tracked_user_id  :integer
 #  public_body_id   :integer
-#  track_medium     :string(255)     not null
-#  track_type       :string(255)     default("internal_error"), not null
+#  track_medium     :string(255)      not null
+#  track_type       :string(255)      default("internal_error"), not null
 #  created_at       :datetime
 #  updated_at       :datetime
 #