Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		2018-08-24 15:10:34 +02:00
..
activitypub	Do not check for file existence when serializing ActivityPub actor (#8386)	2018-08-23 16:39:22 +02:00
rest
rss
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00