all: partially sync with master; upd chlog

2024-03-06 18:33:53 +03:00
parent 48d1c673a9
commit fbc0d981ba
71 changed files with 557 additions and 210 deletions
--- a/scripts/hooks/pre-commit
+++ b/scripts/hooks/pre-commit
@@ -6,7 +6,9 @@ set -e -f -u
 # Bump this number every time a significant change is made to this
 # script.
 #
-# AdGuard-Project-Version: 1
+# AdGuard-Project-Version: 2
+
+# TODO(a.garipov): Add pre-merge-commit.

 # Only show interactive prompts if there a terminal is attached to
 # stdout.  While this technically doesn't guarantee that reading from