This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
v2	…
web	…
base_controller.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00
proofs_controller.rb	…