Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	core/assets/sprites/icon.icns

...

This commit is contained in:

Anuken

2018-05-24 21:14:10 -04:00

parent c19fcb831f ff6268e616

commit 519d2c1714

1 changed files with 0 additions and 0 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

core/assets/sprites/icon.icns

Binary file not shown.