Merge remote-tracking branch 'remotes/origin/master' into 5.0

# Conflicts: # composer.lock
WangNingkai · Sep 24, 2020 · 64b437a · 64b437a
2 parents fa6f519 + 05e96cb
commit 64b437a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/docs/CNAME b/docs/CNAME
@@ -0,0 +1 @@
+olaindex.js.org