Merge branch 'development' of https://github.com/prostoandrei/simplemde-markdown-editor into development

Browse source

Conflicts:
	debug/simplemde.debug.js
	debug/simplemde.js
	dist/simplemde.min.js
	src/js/simplemde.js

...

This commit is contained in:

andrey.vaganov 2016-03-31 13:36:05 +03:00

parent fe1318dd39 4a8ce0bd12

commit 318b4c175f

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 is not available