Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01:00
..
activitypub	Improve support for aspects/circles (#8950)	2018-10-17 17:13:04 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
rss	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02: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	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
manifest_serializer.rb	implement web share target (#6278)	2018-01-17 17:08:10 +01:00
oembed_serializer.rb
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00