Lyzzy/game
1
0
Fork 0
forked from InfoProjekt/game
Code Pull requests Activity

Development #11

Merged
Lyzzy merged 3 commits from InfoProjekt/game:Development into main 2024-03-10 12:51:09 +01:00
Conversation 0 Commits 3 Files changed 1 +2 -2

3 commits

Author SHA1 Message Date
Spafi
4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#77
 2024-03-10 11:46:45 +00:00
SpagettiFisch
4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 12:42:41 +01:00
SpagettiFisch
67a0937c4b changed NPC talking key to f 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 12:42:09 +01:00