mirror of https://framagit.org/tykayn/mastodon.git
ed490b781f
Conflicts: Gemfile.lock config/application.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |