Jeremy Kescher 7f6215984b Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml		2022-10-31 21:37:48 +01:00
..
mastodon-sidekiq.service	Use mimalloc instead of jemalloc	2022-10-29 23:41:37 +02:00
mastodon-streaming.service	Add ReadWritePaths directive to service files (#17178)	2021-12-22 04:34:12 +01:00
mastodon-web.service	Use mimalloc instead of jemalloc	2022-10-29 23:41:37 +02:00
nginx.conf	nginx: optimize locations (#19438)	2022-10-29 15:06:23 +02:00