diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-08 20:43:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 20:43:51 +0100 |
| commit | 42cc93e8923a1b6cdb61574e9a86e360cba56abb (patch) | |
| tree | b01c0a68ef1518b27c51aa382bc89a5ade3b93f8 /Gemfile.lock | |
| parent | 93daa97fc33b663aacaf6656af25d25e0ba4499b (diff) | |
| parent | 674fe32f972614c1617e61bf946e58006d18d019 (diff) | |
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |