Merge remote-tracking branch 'upstream/pull/2037'
authorTom Hughes <tom@compton.nu>
Thu, 1 Nov 2018 18:01:25 +0000 (18:01 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 1 Nov 2018 18:01:25 +0000 (18:01 +0000)
1  2 
Gemfile
Gemfile.lock

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
index 033fed1184feecfd7e3bd16d68803af43596df05,9080f009e1e2929b1b833cdb5fe343114d0f9ce0..08514dcda144e8dad00e92199ddced42f62b2992
@@@ -97,8 -97,13 +97,13 @@@ GE
      crack (0.4.3)
        safe_yaml (~> 1.0.0)
      crass (1.0.4)
 -    dalli (2.7.8)
 +    dalli (2.7.9)
      debug_inspector (0.0.3)
+     delayed_job (4.1.5)
+       activesupport (>= 3.0, < 5.3)
+     delayed_job_active_record (4.1.3)
+       activerecord (>= 3.0, < 5.3)
+       delayed_job (>= 3.0, < 5)
      docile (1.3.1)
      dynamic_form (1.1.4)
      erubi (1.7.1)