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

2018-08-19 09:27:18 +02:00
parent 44e31c3e53 59c68c1a74
commit 88a0395a58
22 changed files with 108 additions and 28 deletions
--- a/1
+++ b/1
@@ -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'