Merge remote-tracking branch 'origin/main' into dev

Browse Source

# Conflicts:
#	src/main/kotlin/ru/mipt/spc/master.kt

...

This commit is contained in:

Alexander Nozik 2022-06-22 21:39:30 +03:00

parent 9fd4620947 0a28331e05

commit d74c8be135

No known key found for this signature in database

GPG Key ID: F7FCF2DD25C71357

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available