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

Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
2020-07-05 19:35:56 +02:00
parent 9b3677d509 99f3a55540
commit 2d8be0a6e1
32 changed files with 433 additions and 416 deletions
--- a/1
+++ b/1
@@ -48,6 +48,7 @@ gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.9'

+gem 'color_diff', '~> 0.1'
 gem 'discard', '~> 1.2'
 gem 'doorkeeper', '~> 5.4'
 gem 'ed25519', '~> 1.2'