Skip to content
Snippets Groups Projects
Verified Commit 4fc4f184 authored by Tóth Miklós Tibor's avatar Tóth Miklós Tibor :shrug:
Browse files

Merge remote-tracking branch 'origin/blint'

# Conflicts:
#	src/projlab/GUI.java
#	src/projlab/SettlerControlPanel.java
parents db79b9e2 31d7c097
No related branches found
No related tags found
Loading
Checking pipeline status
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment