David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml		2018-04-01 20:24:50 -05:00
..
v1	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-01 20:24:50 -05:00
web	Suppress CSRF token warnings (#6240)	2018-01-15 06:51:23 +01:00
base_controller.rb	Ensure that boolean params in the API are parsed for truthiness (#6575)	2018-03-01 02:47:59 +01:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb	Fix response of signature_verification_failure_reason (#6441)	2018-02-08 05:00:45 +01:00
subscriptions_controller.rb