Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +01:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
nodeinfo	Add openRegistrations attribute to nodeinfo endpoint (#12058)	2019-10-02 21:02:48 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +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	Add method and enctype to manifest (#11767)	2019-09-05 15:51:51 +02:00
oembed_serializer.rb
webfinger_serializer.rb