Merge branch 'trunk' into 42 42
authorLukas Jiriste <ljiriste@student.42prague.com>
Wed, 21 Feb 2024 08:57:11 +0000 (09:57 +0100)
committerLukas Jiriste <ljiriste@student.42prague.com>
Wed, 21 Feb 2024 08:57:11 +0000 (09:57 +0100)
commit0702eb443cd1fcdb54cd097227f3cedf29fbe91a
treea63a2548cf0ed6c88eb0299d1c6dd93dc85139f2
parentcd76ce5a98a1774dff2976c2f6e7bb106bbfb13b
parent6216f713528acb89239f743044a67871db28380f
Merge branch 'trunk' into 42