merge upstream V56

This commit is contained in:
github@kiekerjan.isdronken.nl
2022-02-01 21:02:18 +01:00
12 changed files with 1246 additions and 48 deletions
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
# the machine's box will let anyone log into it. So instead we'll put the
# machine on a private network.
config.vm.hostname = "mailinabox.lan"
config.vm.network "private_network", ip: "192.168.50.4"
config.vm.network "private_network", ip: "192.168.56.4"
config.vm.provision :shell, :inline => <<-SH
# Set environment variables so that the setup script does