mirror of https://framagit.org/tykayn/mastodon.git
![]() Conflicts: app/controllers/statuses_controller.rb |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |
![]() Conflicts: app/controllers/statuses_controller.rb |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |