diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:07:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:07:31 +0000 |
commit | d91f5211693e913da5df110b8de841fad87e3653 (patch) | |
tree | d1483aeb8fe3d2b9579b0e44f2e74979c4b8d17a /Gemfile.lock | |
parent | c859c3bfd242288065fe5e2d887f7204f09e2335 (diff) | |
download | gitlab-ce-d91f5211693e913da5df110b8de841fad87e3653.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4949ac8b9a5..500f1729d08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -741,7 +741,7 @@ GEM parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) - pg (1.1.4) + pg (1.2.2) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) |