Merge remote-tracking branch 'upstream/master'

Author: gerundt

.htaccess

@@ -281,9 +281,6 @@ AddDefaultCharset utf-8
     # (5)
     # RewriteOptions <options>
 
-    # Redirect "democlient.html" to the new place...
-    Redirect permanent /democlient.html https://cppcheck.sourceforge.io/demo/
-
     # Redirect "devinfo.html" to the new place...
     Redirect permanent /devinfo.html https://cppcheck.sourceforge.io/devinfo/
 

make.js

@@ -35,8 +35,7 @@
 
         // pack.css
         var inCss = cat(["site/css/normalize.css",
-                         "site/css/all.css",
-                         "site/css/demo.css"]);
+                         "site/css/all.css"]);
 
         var minifier = new CleanCSS({
             keepSpecialComments: 0,