game/modules/tome/dialogs/debug/DebugMain.lua · bfb8c3cc9d725c44d7601bdc2b6f876bdc8d3148 · Otowa Kotori / Tales of MajEyal · GitLab

Jun 18, 2017
bfb8c3cc
Merge branch 'master' into Inscriptions · bfb8c3cc
Chris Davidson authored Jun 18, 2017
```
# Conflicts:
#	game/modules/tome/data/general/stores/basic.lua
```
bfb8c3cc
Merge branch 'master' into Inscriptions
Chris Davidson authored Jun 18, 2017
```
# Conflicts:
#	game/modules/tome/data/general/stores/basic.lua
```