Merge remote-tracking branch 'origin/master' into jmuchovej-bump-to-1…

….6.1
conda-forge · Jul 19, 2021 · 73fcdd8 · 73fcdd8
2 parents 72c7c39 + e22ffee
commit 73fcdd8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/migrations/pcre21037.yaml b/.ci_support/migrations/pcre21037.yaml
@@ -0,0 +1,7 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+migrator_ts: 1622491612.3316026
+pcre2:
+- '10.37'