Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		2019-03-26 16:02:54 +01:00
..
activitypub	Set and store report URIs (#10303)	2019-03-17 15:34:56 +01:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
rss	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb	Fix min/max duration poll limits being inverted	2019-03-08 20:43:18 +01:00
manifest_serializer.rb	Improve config serializer for Keybase (#10338)	2019-03-21 23:33:28 +01:00
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	2019-03-25 15:01:09 +01:00
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00