Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml		2018-05-11 18:12:42 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
web	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00
base_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
oembed_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
push_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
salmon_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
subscriptions_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00