mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 22:26:54 +00:00
9ae60f8738
Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file. |
||
---|---|---|
.. | ||
activity | ||
parser | ||
activity.rb | ||
adapter.rb | ||
case_transform.rb | ||
dereferencer.rb | ||
forwarder.rb | ||
linked_data_signature.rb | ||
serializer.rb | ||
tag_manager.rb |