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 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
rest	…
rss	…
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…