Merge branch 'master' into production

2018-03-21 13:35:40 -05:00 · 2018-03-21 13:35:40 -05:00 · ebb823f66e
commit ebb823f66e
parent 69c02fae9e dc017aa2f1
2 changed files with 4 additions and 0 deletions
--- a/1
+++ b/1
@ -24,6 +24,7 @@ gem 'redcarpet', '~> 3.4.0'
 # Use ActiveModel has_secure_password
 gem 'bcrypt', '~> 3.1.11'

+gem 'tzinfo-data'

 group :development, :test do

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -220,6 +220,8 @@ GEM
    turbolinks-source (5.1.0)
    tzinfo (1.2.5)
      thread_safe (~> 0.1)
+    tzinfo-data (1.2018.3)
+      tzinfo (>= 1.0.0)
    uglifier (4.1.8)
      execjs (>= 0.3.0, < 3)
    unitwise (2.2.0)
@ -255,6 +257,7 @@ DEPENDENCIES
  sqlite3
  therubyracer
  turbolinks (~> 5.1.0)
+  tzinfo-data
  uglifier (>= 1.3.0)
  unitwise (~> 2.2.0)