mastodon/config/environments
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
..
development.rb Raise Mastodon::HostValidationError when host for HTTP request is private (#6410) 2018-02-24 19:16:11 +01:00
production.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
test.rb Isolate each specs for cache store (#6450) 2018-02-17 22:35:05 +01:00