mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
ce12934f5b
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency. |
||
---|---|---|
.. | ||
chewy | ||
config/initializers | ||
controllers | ||
fabricators | ||
features | ||
fixtures | ||
helpers | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
serializers | ||
services | ||
support | ||
validators | ||
views/statuses | ||
workers | ||
fabricators_spec.rb | ||
rails_helper.rb | ||
spec_helper.rb |