Merge branch 'master' into patch-2

7 years ago · 357332b861
parent 19239c985e 57cf499f22
commit 357332b861
1 changed files with 5 additions and 1 deletions
--- a/cnames_active.js
+++ b/cnames_active.js
@ -853,5 +853,9 @@ var cnames_active = {
 ,"zodiac": "indus.github.io/Zodiac" //noCF? (don´t add this in a new PR)
 ,"zombie": "assaf.github.io/zombie" //noCF? (don´t add this in a new PR)
 ,"zuck": "blanket-warriors.github.io/Zuck"
-,"display": "https://arguiot.github.io/DisplayJS/"
+/*
+* please don't add your subdomain records down here!
+* insert them in alphabetical order to help reduce merge conflicts.
+* <3
+*/
 }