Nathan Sobo 875cfefd36 Merge branch 'master' into ns-ks-react-dont-measure-when-hidden ...

Conflicts:
	spec/editor-component-spec.coffee
	src/editor-component.coffee
	src/editor-scroll-view-component.coffee
	src/lines-component.coffee

2014-05-22 10:48:21 -06:00

4.0 KiB

Raw Blame History

View Raw