Merge branch '3.6-release'

To fix wrong merge of 3.6-rc
Quix0r · Mar 23, 2018 · dbe8118 · dbe8118
2 parents 39dd3df + 8f7503d
commit dbe8118
Show file tree

Hide file tree

Showing 350 changed files with 3,346 additions and 20,227 deletions.
diff --git a/appnet/AppDotNet.php b/appnet/AppDotNet.php
diff --git a/appnet/DigiCertHighAssuranceEVRootCA.pem b/appnet/DigiCertHighAssuranceEVRootCA.pem
diff --git a/appnet/README.md b/appnet/README.md
diff --git a/appnet/appnet.css b/appnet/appnet.css