lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-03-20 09:38:39 +08:00
Code Issues Projects Releases Wiki Activity
114 Commits 18 Branches 64 Tags
cd407f9e55408cade7ba4fb1f4d7018d79b330e4
Commit Graph

2 Commits

Author SHA1 Message Date
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