Merge remote-tracking branch 'origin/master-noInternet' into master-noInternet

Browse Source

# Conflicts:
#	desktop/src/com/unciv/app/desktop/PlatformSpecificHelpersDesktop.kt

...

This commit is contained in:

alexban011 2022-05-02 22:08:22 +03:00

parent f52ad60b51 49815b7933

commit bd6474b50d

1 changed files with 1 additions and 1 deletions

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