djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 09:04:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
6530f9709c
tootlab-mastodon/config/environments
History
Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
..
development.rb Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
production.rb Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream 2023-07-13 13:35:15 +02:00
test.rb Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00