Merge branch 'master' into glitch-soc/merge-upstream

2020-04-04 21:47:37 +02:00
parent 5c5317041f d3ff06a320
commit 8fef96cbf5
18 changed files with 215 additions and 385 deletions
@@ -91,7 +91,7 @@ VAGRANTFILE_API_VERSION = "2"

 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "ubuntu/bionic64"

  config.vm.provider :virtualbox do |vb|
    vb.name = "mastodon"