Merge branch 'main' into glitch-soc/merge-upstream
This commit is contained in:
		
						commit
						7c25251a39
					
				@ -60,7 +60,7 @@ mastodon:
 | 
				
			|||||||
    concurrency: 25
 | 
					    concurrency: 25
 | 
				
			||||||
  smtp:
 | 
					  smtp:
 | 
				
			||||||
    auth_method: plain
 | 
					    auth_method: plain
 | 
				
			||||||
    ca_file:
 | 
					    ca_file: /etc/ssl/certs/ca-certificates.crt
 | 
				
			||||||
    delivery_method: smtp
 | 
					    delivery_method: smtp
 | 
				
			||||||
    domain:
 | 
					    domain:
 | 
				
			||||||
    enable_starttls_auto: true
 | 
					    enable_starttls_auto: true
 | 
				
			||||||
 | 
				
			|||||||
@ -10625,9 +10625,9 @@ tiny-warning@^1.0.0:
 | 
				
			|||||||
  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 | 
					  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tmpl@1.0.x:
 | 
					tmpl@1.0.x:
 | 
				
			||||||
  version "1.0.4"
 | 
					  version "1.0.5"
 | 
				
			||||||
  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
 | 
					  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
 | 
				
			||||||
  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 | 
					  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 | 
				
			||||||
 | 
					
 | 
				
			||||||
to-arraybuffer@^1.0.0:
 | 
					to-arraybuffer@^1.0.0:
 | 
				
			||||||
  version "1.0.1"
 | 
					  version "1.0.1"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user