diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
| commit | 2d8be0a6e1fbe9da892937b05b373ab907d89b77 (patch) | |
| tree | 73eb669adcc8b13c63dded5a887cb5ecc817894d /Gemfile.lock | |
| parent | 9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff) | |
| parent | 99f3a5554074d9a12619797c474b3de4c6085f02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fc59c882d..d91d70191 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,6 +165,7 @@ GEM cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.3) + color_diff (0.1) concurrent-ruby (1.1.6) connection_pool (2.2.3) crack (0.4.3) @@ -690,6 +691,7 @@ DEPENDENCIES chewy (~> 5.1) cld3 (~> 3.3.0) climate_control (~> 0.2) + color_diff (~> 0.1) concurrent-ruby connection_pool devise (~> 4.7) |