mirror of https://github.com/Siphonay/mastodon
991371af5f
Conflicts: db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |
991371af5f
Conflicts: db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |