Merge branch 'dev' into feature/new-tariffs

# Conflicts:
#	.gitignore
#	bot/app/web/subscription_webapp.py
#	tests/test_settings.py

docker-compose.yml

@@ -14,6 +14,11 @@ services:
     ports:
       - 127.0.0.1:8080:8080
       - 127.0.0.1:${WEBAPP_SERVER_PORT:-8081}:${WEBAPP_SERVER_PORT:-8081}
+    # Optional Tariffs 2.0 config. Put tariffs.json near this compose file,
+    # then uncomment the mount below. If no JSON is mounted, legacy .env
+    # pricing is used.
+    # volumes:
+    #   - ./tariffs.json:/app/config/tariffs.json:ro
     healthcheck:
       test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8080/healthz >/dev/null || exit 1"]
       interval: 30s