Merge branch 'main' into next

# Conflicts:
#	package.json
#	website/package.json
#	website/yarn.lock
#	yarn.lock
This commit is contained in:
fisker Cheung committed 2022-01-10 16:41:09 +08:00
commit 668bbe7d0e
9 files changed
+1074 -748

No files matched your search

+3 -1
View File
@@ -198,6 +198,7 @@
"miniprettier",
"mitermayer",
"mjml",
"Modifer",
"Moeller",
"Monteiro",
"Morrell",
@@ -363,7 +364,8 @@
"\\(https?://.*?\\)",
"author: \".*?\"",
"authorURL: \".*?\"",
"\"author\": \".*?\""
"\"author\": \".*?\"",
"(long|after){3,}"
],
"files": [
"*",