Merge branch 'master' into image-opts

indentlabs · Jan 6, 2022 · 724b1cc · 724b1cc
2 parents a4d2500 + 97bc18b
commit 724b1cc
Show file tree

Hide file tree

Showing 66 changed files with 848 additions and 281 deletions.
diff --git a/Gemfile b/Gemfile
@@ -74,8 +74,11 @@ gem 'barnes'
 
 # Forum
 gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feature/report-posts'
+# gem 'thredded', git: 'https://github.com/thredded/thredded', branch: 'master'
+# gem 'thredded', git: 'https://github.com/sudara/thredded', branch: 'master'
 gem 'rails-ujs'
 gem 'language_filter'
+gem 'discordrb'
 
 # Smarts
 gem 'word_count_analyzer'