Thibaut Girka 1f7e7594db Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		2020-01-20 15:00:22 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
v2	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
web	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
base_controller.rb	Fix generic HTTP 500 error on duplicate records (#12563)	2019-12-06 22:40:06 +01:00
oembed_controller.rb	Fix access to OEmbed endpoint in secure mode (#12864)	2020-01-14 08:52:32 +01:00
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	2019-11-28 04:07:49 +01:00