diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-07 20:04:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 20:04:22 +0200 |
| commit | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (patch) | |
| tree | 2e1b3be0201e53c96f05993f1295b0e97bb14166 /Gemfile.lock | |
| parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
| parent | e8ad0a800616a1f95fd71ab8457869e716212ca0 (diff) | |
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5a096ba06..6979c7a0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,7 +229,7 @@ GEM tzinfo excon (0.62.0) fabrication (2.20.2) - faker (1.9.6) + faker (2.1.0) i18n (>= 0.7) faraday (0.15.0) multipart-post (>= 1.2, < 3) @@ -698,7 +698,7 @@ DEPENDENCIES doorkeeper (~> 5.1) dotenv-rails (~> 2.7) fabrication (~> 2.20) - faker (~> 1.9) + faker (~> 2.1) fast_blank (~> 1.0) fastimage fog-core (<= 2.1.0) |