mirror of https://github.com/Siphonay/mastodon
198283a188
Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes. |
||
---|---|---|
.. | ||
activity | ||
parser | ||
adapter_spec.rb | ||
dereferencer_spec.rb | ||
linked_data_signature_spec.rb | ||
tag_manager_spec.rb |