Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02:00
..
activitypub	Bot nameplates (#7391)	2018-05-07 09:31:07 +02:00
rest	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
rss	…
web	…
initial_state_serializer.rb	…
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…