]> Nutra Git (v1) - gamesguru/getmyancestors.git/commitdiff
projects / gamesguru / getmyancestors.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12f4a2c 15290f5)
Merge origin/master into dev
authorShane Jaroch <chown_tee@proton.me>
Thu, 22 Jan 2026 23:01:36 +0000 (18:01 -0500)
committerShane Jaroch <chown_tee@proton.me>
Thu, 22 Jan 2026 23:01:36 +0000 (18:01 -0500)
Resolved conflicts:
- session.py: kept dev's comprehensive refactor
- gui.py: kept dev's safer error handling
- pyproject.toml: kept dev's full dependency list
- Deleted: tree.py, getmyancestors.py, requirements.txt (superseded by refactor)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.