diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 17:30:42 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 18:09:28 +0200 |
| commit | 53b7bb9d047cfc8b21ee0540bd3e5285267160fd (patch) | |
| tree | 30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /Gemfile | |
| parent | af934b90710a2ce1099d3ceda5de7bcf0e94595c (diff) | |
| parent | 81697997a3fdbb481202a179908958198baaf0dd (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile index e781da8ae..356081dbf 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,7 @@ gem 'pkg-config', '~> 1.3' gem 'puma', '~> 3.11' gem 'rails', '~> 5.2.1' +gem 'thor', '~> 0.20' gem 'hamlit-rails', '~> 0.2' gem 'pg', '~> 1.0' |