mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-11 13:10:37 +00:00
e855df149b
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies. |
||
---|---|---|
.. | ||
account_counters_spec.rb | ||
account_finder_concern_spec.rb | ||
account_interactions_spec.rb | ||
remotable_spec.rb | ||
status_threading_concern_spec.rb |