Merge pull request #204 from glitch-soc/with-mastodon-go

Introducing: Mastodon GO!
7 years ago · 73bf0ea7d1
parent 254b74c71f 276432790a
commit 73bf0ea7d1
3 changed files with 5 additions and 1 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "app/javascript/themes/mastodon-go"]
+	path = app/javascript/themes/mastodon-go
+	url = https://github.com/marrus-sh/mastodon-go
--- a/2
+++ b/2
@ -83,7 +83,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

  config.vm.provider :virtualbox do |vb|
    vb.name = "mastodon"
-    vb.customize ["modifyvm", :id, "--memory", "2048"]
+    vb.customize ["modifyvm", :id, "--memory", "4096"]

    # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
    # https://github.com/mitchellh/vagrant/issues/1172
--- a/app/javascript/themes/mastodon-go
+++ b/app/javascript/themes/mastodon-go
@ -0,0 +1 @@
+Subproject commit 1ba394d1d7c38fd92159548824d1ba42719df6c3
				`@ -0,0 +1 @@`
				`Subproject commit 1ba394d1d7c38fd92159548824d1ba42719df6c3`