David Yip c08c971dd3 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
..
environments	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
initializers	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
locales	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
webpack	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-28 22:45:17 -06:00
application.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
boot.rb	Adds bootsnap. Faster boot time (#3176)	2017-05-20 19:42:27 +02:00
brakeman.ignore	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
database.yml	use-DB_NAME-in-development (#5430)	2017-10-17 11:45:37 +02:00
deploy.rb	Update dependencies for Ruby (2017-10-30) (#5566)	2017-10-31 12:22:32 +01:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
navigation.rb	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
puma.rb	Do not set port for puma if it is bound to unix socket (#2289)	2017-04-22 01:22:20 +02:00
routes.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-09 09:25:53 -06:00
sidekiq.yml	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
webpacker.yml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00