3 Commits

Author	SHA1	Message	Date
Jamie Peabody	e25acfe3b5	Added query params settings to editor	2015-06-28 12:06:06 +01:00
Jamie Peabody	e9e0a9d41b	Merge branch 'master' of https://github.com/kljh/Mergely ... Conflicts: lib/mergely.js	2014-08-17 15:35:16 +01:00
Jamie Peabody	290f7606c7	Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.	2013-06-24 20:20:19 +01:00