3d6c594903
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though… |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |
3d6c594903
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though… |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |