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
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
nodeinfo	…
rest	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
rss	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…