mastodon

Author	SHA1	Message	Date
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	2023-07-30 14:58:56 +02:00
Eugen Rochko	4d01d1a1ee	Remove 16:9 cropping from web UI (#26132 )	2023-07-24 13:46:55 +02:00
Claire	3dcba94e68	Migrate glitch-soc's exclusive user settings	2023-03-31 22:50:57 +02:00
Eugen Rochko	a9b5598c97	Change user settings to be stored in a more optimal way (#23630 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-03-30 14:44:00 +02:00