Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

v1

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

web

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

base_controller.rb

Disable API access when login is disabled (#7289)

2018-04-30 09:13:14 +02:00

oembed_controller.rb

Update status embeds (#4742)

2017-08-30 10:23:43 +02:00

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

…