Estevao Soares dos Santos 0c6b5bdc4b Merge branch 'develop' of https://github.com/showdownjs/showdown into develop ... # Conflicts: # dist/showdown.js # dist/showdown.js.map # dist/showdown.min.js # dist/showdown.min.js.map		2018-09-14 14:11:08 +01:00
..
makehtml	Merge branch 'develop' of https://github.com/showdownjs/showdown into develop	2018-09-14 14:11:08 +01:00
makemarkdown	test: fix tests	2017-12-23 13:20:14 +00:00