Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		2018-05-19 22:41:10 +02:00
..
activitypub	Bot nameplates (#7391)	2018-05-07 09:31:07 +02:00
rest	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
rss	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
web	Improve payload format of Web Push API now that it's open (#7521)	2018-05-19 14:46:47 +02:00
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
manifest_serializer.rb	implement web share target (#6278)	2018-01-17 17:08:10 +01:00
oembed_serializer.rb	…
webfinger_serializer.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00