Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
2018-08-27 17:30:42 +02:00
parent af934b9071 81697997a3
commit 53b7bb9d04
83 changed files with 900 additions and 120 deletions
--- a/1
+++ b/1
@@ -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'