Merge branch 'master' into bye-bye-nginx-proxy
This commit is contained in:
		@@ -22,6 +22,7 @@ matrix_mautrix_discord_data_path: "{{ matrix_mautrix_discord_base_path }}/data"
 | 
			
		||||
matrix_mautrix_discord_docker_src_files_path: "{{ matrix_mautrix_discord_base_path }}/docker-src"
 | 
			
		||||
 | 
			
		||||
matrix_mautrix_discord_homeserver_address: ""
 | 
			
		||||
matrix_mautrix_discord_homeserver_public_address: ''
 | 
			
		||||
matrix_mautrix_discord_homeserver_domain: "{{ matrix_domain }}"
 | 
			
		||||
matrix_mautrix_discord_appservice_address: "http://matrix-mautrix-discord:8080"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user