c0b876f726
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns. |
||
---|---|---|
.. | ||
activitypub | ||
rest | ||
rss | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |