Update codemirror
Set back height of codemirror
Improve performance for long line. Related to #536
Fix margin bottom. Regression when we updated codemirror
Fix regression from when we updated CM. See #192
Update codemirror. Related to #529
Merge branch 'issue_546' into v1.4.x
Merge branch 'v1.4.x' of github.com:rethinkdb/rethinkdb into v1.4.x
Change the return type of table(). Review by @mglukhovsky over the shoulder. Related to #540
NOTES for v1.4.2 release
fixes JS driver bug introduced by issue_546 merge
Merge branch 'michel_536_large_file' into next
Merge v1.4.2 in next
Merge v1.4.x in next
Merge branch 'next' into sam_207