Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	resources/resources.qrc

...

This commit is contained in:

sshumakov3

2020-11-16 00:34:47 +03:00

parent 48b209d10e 3226ff2ae1

commit 684980c6da

4 changed files with 243 additions and 236 deletions

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

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

BIN

resources/Font Awesome 5 Pro-Regular-400.otf Normal file

Binary file not shown.