Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.		2019-03-11 11:23:50 +01:00
..
index.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-11 11:23:50 +01:00