Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.

2019-12-07 12:28:59 +01:00

..

v1

Merge branch 'master' into glitch-soc/merge-upstream

2019-12-07 12:28:59 +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

Update status embeds (#4742)

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

proofs_controller.rb

Fix proofs API being inaccessible in secure mode (#12495)

2019-11-28 04:07:49 +01:00