Merge branch 'exportscale' of https://github.com/jnlopar/piskel into exportscale

Browse Source

Conflicts:
	src/css/settings.css

...

This commit is contained in:

Jason Neufeld 2015-09-06 11:57:55 -07:00

parent c7a80ebdec 2280740421

commit 251ceae318

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