Programmist73 d6cdd178cd Merge remote-tracking branch 'origin/LabWork04' into LabWork04 ...

# Conflicts:
#	front/premium_store/public/index.html
#	spring_online_calculator/src/main/java/premium_store/model/TankLevel.java

2023-05-26 17:47:51 +04:00

..

index.html

Merge remote-tracking branch 'origin/LabWork04' into LabWork04

2023-05-26 17:47:51 +04:00