Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
activitypub	Add ActivityPub representation for identity proofs (#10414)	2019-03-30 02:12:06 +01:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
rss	…
web	…
initial_state_serializer.rb	…
manifest_serializer.rb	…
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	2019-03-25 15:01:09 +01:00
webfinger_serializer.rb	…