about summary refs log tree commit diff
path: root/app/javascript/skins/vanilla
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-15 12:20:56 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-12-15 12:20:56 -0600
commit82b2e224a26765caf743b24844912faa2de9873a (patch)
tree1ee49dd3dbcef7867ad93f875262951612815851 /app/javascript/skins/vanilla
parent6abb0950c6f694607cdc6a0c564751400d52ad5a (diff)
parente0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff)
Merge branch 'gs-master' into prevent-local-only-federation
 Conflicts:
	db/schema.rb
Diffstat (limited to 'app/javascript/skins/vanilla')
-rw-r--r--app/javascript/skins/vanilla/win95/common.scss (renamed from app/javascript/skins/vanilla/win95.scss)0
-rw-r--r--app/javascript/skins/vanilla/win95/names.yml4
2 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/skins/vanilla/win95.scss b/app/javascript/skins/vanilla/win95/common.scss
index 298f6ee9d..298f6ee9d 100644
--- a/app/javascript/skins/vanilla/win95.scss
+++ b/app/javascript/skins/vanilla/win95/common.scss
diff --git a/app/javascript/skins/vanilla/win95/names.yml b/app/javascript/skins/vanilla/win95/names.yml
new file mode 100644
index 000000000..2083084a2
--- /dev/null
+++ b/app/javascript/skins/vanilla/win95/names.yml
@@ -0,0 +1,4 @@
+en:
+  skins:
+    vanilla:
+      win95: Masto95