Merge branch 'release/1.6.0'

civictheme · Nov 10, 2023 · 6365037 · 6365037
2 parents 7ad22ae + 1bd2822
commit 6365037
Show file tree

Hide file tree

Showing 2,604 changed files with 11,775 additions and 27,004 deletions.
diff --git a/.ahoy.local.example.yml b/.ahoy.local.example.yml
@@ -0,0 +1,14 @@
+---
+ahoyapi: v2
+usage: Project specific ahoy commands.
+
+commands:
+  help:
+    cmd: |
+      echo "[INFO] Custom local commands"
+      echo "You may add custom local commands to your toolchain. This local Ahoy file will not be comitted to the repository"
+      echo
+
+#  mylocalcommand:
+#    cmd: |
+#      echo "Anything complex you can do on the command line."
diff --git a/.ahoy.yml b/.ahoy.yml
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.docker/Dockerfile.cli b/.docker/Dockerfile.cli
diff --git a/.docker/Dockerfile.cli.onlytheme b/.docker/Dockerfile.cli.onlytheme
diff --git a/.docker/Dockerfile.cli.sibling b/.docker/Dockerfile.cli.sibling