Merge branch 'master' into rc

acuderman · May 20, 2021 · 4e4a7a2 · 4e4a7a2
2 parents 1ea73bb + 4a1a239
commit 4e4a7a2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -14,5 +14,5 @@ repository:
   archived: false
   private: false
   allow_squash_merge: true
-  allow_merge_commit: false
+  allow_merge_commit: true
   allow_rebase_merge: true