diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
| commit | a2e7997592dd86baa7595c41eed274be4c200d07 (patch) | |
| tree | b4c21af8bdf541d8156beb29e9f53766bd1fbadd /config/application.rb | |
| parent | 6517b7b9f02f8590a8f9c5aa04e3ef9efeb4e757 (diff) | |
| parent | cec1e902e006730f68bde0a4334e5b819a12a475 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 4d6c7ebf1..6fa3654d8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,7 +22,6 @@ require 'mail' Bundler.require(*Rails.groups) require_relative '../lib/exceptions' -require_relative '../lib/enumerable' require_relative '../lib/sanitize_ext/sanitize_config' require_relative '../lib/redis/namespace_extensions' require_relative '../lib/paperclip/url_generator_extensions' |