LIghtJUNction 4d1e0ef1be merge: resolve conflicts from upstream ...

Conflict resolution: accepted HEAD versions for all conflicted files.

2026-04-15 17:03:54 +08:00

..

astrbot.service

update astrbot.service

2026-03-18 01:22:43 +08:00

fw2hw.sh

chore: fw2hw

2026-03-20 00:44:08 +08:00

hatch_build.py

Merge branch 'master' into dev

2026-04-10 20:58:41 +08:00

pr_test_env.sh

chore: update gitignore, Makefile, skills route, and test scaffolding

2026-02-16 02:38:01 +08:00

run_pytests_ci.sh

chore: resolve merge conflicts (prefer HEAD)

2026-03-22 19:50:26 +08:00

smoke_startup_check.py

fix: downgrade python-ripgrep version to 0.0.8 in dependencies (#7514)

2026-04-13 20:54:18 +08:00

start-with-neo.sh

feat(scripts): update start-with-neo.sh for auto-provisioned API key

2026-02-17 04:24:44 +08:00