f224237862
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's. |
||
---|---|---|
.. | ||
activity | ||
adapter_spec.rb | ||
dereferencer_spec.rb | ||
linked_data_signature_spec.rb | ||
tag_manager_spec.rb |