mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -05:00
fc500a6062
Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. |
||
---|---|---|
.. | ||
action_dispatch | ||
active_record | ||
assets | ||
chewy/strategy | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
tasks | ||
templates | ||
terrapin | ||
webpacker | ||
cli.rb | ||
enumerable.rb | ||
exceptions.rb |