Merge branch 'main' into 'gui'

Browse Source

# Conflicts:
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java

...

This commit is contained in:

Johannes Schmelz

2024-12-12 16:50:21 +00:00

parent 5de76f3226 249110f83c

commit 10e30d9bd9

2 changed files with 1 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

BIN

Projekte/monopoly/client/src/main/resources/Pictures/dice/5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 132 KiB After Width:  |  Height:  |  Size: 105 KiB