Merge 419233f9f8 into c4e782a90c

2016-04-01 13:06:50 +00:00 · 2016-04-01 13:06:50 +00:00 · 7687936948
commit 7687936948
parent c4e782a90c 419233f9f8
5 changed files with 92 additions and 0 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -467,6 +467,8 @@ GEM
      coffee-rails
    tzinfo (1.2.2)
      thread_safe (~> 0.1)
+    tzinfo-data (1.2016.3)
+      tzinfo (>= 1.0.0)
    uglifier (2.5.0)
      execjs (>= 0.3.0)
      json (>= 1.8.0)
@ -578,6 +580,7 @@ DEPENDENCIES
  timecop
  transitions
  turbolinks
+  tzinfo-data
  uglifier (>= 1.3.0)
  unobtrusive_flash (>= 3)
  web-console (~> 2.0)