diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-08 20:15:57 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-08 20:15:57 +0100 |
| commit | 674fe32f972614c1617e61bf946e58006d18d019 (patch) | |
| tree | 62e4a703d86ffa2203a7961a3d76d36970226e05 /Gemfile.lock | |
| parent | 29a09858f6700c0a6eb17797836589ed0839dec9 (diff) | |
| parent | 3f4a6d44fe8366dc4d71501dc2d799d641af4687 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 2c8fd59c6..684a34c0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -402,7 +402,7 @@ GEM pg (1.1.4) pghero (2.2.0) activerecord - pkg-config (1.3.4) + pkg-config (1.3.5) powerpack (0.1.2) premailer (1.11.1) addressable |