Merge remote-tracking branch 'origin/LabWork07' into LabWork08

# Conflicts:
#	Project/src/FormMapWithSetPlanesGeneric.java
This commit is contained in:
Programmist73 2022-12-08 23:11:17 +04:00
commit 28eafe6f61