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, 16 insertions, 0 deletions

diff --git a/spec/models/track_thing_spec.rb b/spec/models/track_thing_spec.rb
index c42eb5e8b..86d3c0cda 100644
--- a/spec/models/track_thing_spec.rb
+++ b/spec/models/track_thing_spec.rb
@@ -1,3 +1,19 @@
+# == Schema Information
+#
+# Table name: track_things
+#
+#  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
+#  created_at       :datetime
+#  updated_at       :datetime
+#
+
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TrackThing, "when tracking changes" do