Merge branch 'Danis'

Browse Source

# Conflicts:
#	Content/Maps/MainScene.umap

...

This commit is contained in:

Lenta_Mebiusa

2021-10-03 19:45:55 +05:00

parent 85b4961308 f7a8a53386

commit fff3ca05e8

2 changed files with 0 additions and 0 deletions

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

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

Content/Maps/MainScene.umap

BIN

Binary file not shown.

Content/Maps/People.umap

BIN

Binary file not shown.