Merge branch 'future/I2Localization' of bitbucket.org:usaya/popcorn into future/I2Localization

Browse Source

# Conflicts:
#	popcorn/Assets/MyGame/Scenes/Main/Mission.unity

...

This commit is contained in:

koya_15 2022-01-19 15:02:01 +09:00

parent b16c0c2ec3 c07e778844

commit 9f38f1875d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available