diff options
author | ThibG <thib@sitedethib.com> | 2018-08-19 09:46:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-19 09:46:26 +0200 |
commit | 484b9314e351fcab9e25b04c0024598433d2d688 (patch) | |
tree | 301ba59a7d214d5cf655263c95d731b9f18b6566 /Gemfile | |
parent | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (diff) | |
parent | 88a0395a58739ff0a4bc8ff79bc0b60ac2c0f736 (diff) |
Merge pull request #652 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile index 1b95426c5..6421693da 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem 'rails', '~> 5.2.1' gem 'hamlit-rails', '~> 0.2' gem 'pg', '~> 1.0' +gem 'makara', '~> 0.4' gem 'pghero', '~> 2.1' gem 'dotenv-rails', '~> 2.2', '< 2.3' |