mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-21 14:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict resolve

Browse Source
This commit is contained in:
muscode13 2024-10-07 17:02:34 -06:00
parent ac7751973d
commit fc89850e07
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales

@ -1 +1 @@
Subproject commit b44ee2173788018ffd5dc6b7b7fa159be5b9d514
Subproject commit 3ccef8472dd7cc7c362538489954cb8fdad27e5f