You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/dist
Jeremy Kescher 68101baae1
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/controllers/settings/preferences_controller.rb
#	app/javascript/mastodon/utils/resize_image.js
#	app/lib/user_settings_decorator.rb
#	app/models/media_attachment.rb
#	app/models/user.rb
#	app/views/settings/preferences/appearance/show.html.haml
#	app/workers/scheduler/indexing_scheduler.rb
#	config/settings.yml
#	db/schema.rb
1 year ago
..
mastodon-sidekiq.service Apparently, the segfaults were not jemalloc's fault. 2 years ago
mastodon-streaming.service Apparently, the segfaults were not jemalloc's fault. 2 years ago
mastodon-web.service Apparently, the segfaults were not jemalloc's fault. 2 years ago
nginx.conf Change media upload limits and remove client-side resizing (#23726) 1 year ago