Ed Sanders f2b4998faf HACK: Don't merge adjacent annotations from Parsoid ... Adjacent annotations should not be merged if they both originate from Parsoid. This is a hack because this logic should be in Parsoid, not VE. Bug: 49873 Change-Id: If1e23e3039178300d72b1c0c585931417bb603b5		2013-07-14 18:36:33 -07:00
..
jquery	jquery.client: Update to upstream from 92f06b4a in mediawiki/core.git	2013-07-10 23:23:11 +02:00
oojs	oojs: Integrate with OOJS v1.0.0	2013-06-06 17:29:55 +02:00
qunit	Upstream: Update QUnit from v1.10.0 to v1.11.0	2013-02-19 19:50:02 +01:00
rangy	Convert from DOS line endings (CRLF) to Unix ones (LF)	2013-05-25 23:51:21 +02:00
unicodejs	Separate out UnicodeJS tests properly	2013-07-05 14:15:08 +02:00
ve	HACK: Don't merge adjacent annotations from Parsoid	2013-07-14 18:36:33 -07:00
ve-mw	HACK: Don't merge adjacent annotations from Parsoid	2013-07-14 18:36:33 -07:00