Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml		2018-05-11 18:12:42 +02:00
..
activitypub	…
rest	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
rss	…
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…