mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 04:55:05 +00:00
ed490b781f
Conflicts: Gemfile.lock config/application.rb |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |