Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	magic.py

master final_version

anton 2023-10-03 07:36:22 +03:00

parent 6c0a876865 46a903939d

commit 7cc65eab81

Signed by: anton

GPG Key ID: 50F7E97F96C07ECF

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