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, 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
 #