mastodon

Author	SHA1	Message	Date
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	2018-12-09 16:08:04 +01:00
Eugen Rochko	73be8f38c1	Add profile directory (#9427 ) Fix #5578	2018-12-06 17:36:11 +01:00
Thibaut Girka	1df392819d	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
Eugen Rochko	6ddf0432e7	Improve account suspension speed and completeness (#9290 ) - Some associations were missing from the clean-up - Some attributes were not reset on suspension - Skip federation and streaming deletes when purging a dead domain - Move account association definitions to concern	2018-12-03 01:32:08 +01:00