You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 0117de0a01 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml		6 years ago
..
activitypub	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)	6 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
rss	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
web	Only display web push notifications after API call (fixes #7902) (#8396)	6 years ago
initial_state_serializer.rb	Fix min/max duration poll limits being inverted	6 years ago
manifest_serializer.rb	Improve config serializer for Keybase (#10338)	6 years ago
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	6 years ago
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	6 years ago