Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
activitypub	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
rss	When serializing polls over OStatus, serialize poll options to text (#10160)	2019-03-05 21:09:18 +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	Upgrade new Web Share Target API (#9963)	2019-02-02 01:26:49 +01:00
oembed_serializer.rb
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00