jsbin/public/js/editors/codemirror.js
Aron Carroll 54bdaa6280 Merge branch 'next/3' into 'feature/node'
Massive merge I'm sure nearly everything is broken :)

Conflicts:
	config.default.php
	index.php
	js/chrome/download.js
	public/app.php
	public/font/fontawesome-webfont.eot
	public/font/fontawesome-webfont.svg
	public/font/fontawesome-webfont.svgz
	public/font/fontawesome-webfont.ttf
	public/font/fontawesome-webfont.woff
	public/font/pictos-web.eot
	public/font/pictos-web.svg
	public/font/pictos-web.ttf
	public/font/pictos-web.woff
	public/js/chrome/login.js
	public/js/chrome/navigation.js
	public/js/jsbin.js
2012-05-25 14:17:32 +01:00

7 lines
269 B
JavaScript

//= require "../vendor/codemirror2/codemirror"
//= require "../vendor/codemirror2/xml"
//= require "../vendor/codemirror2/css"
//= require "../vendor/codemirror2/javascript"
//= require "../vendor/codemirror2/htmlmixed"
//= require "../vendor/codemirror2/searchcursor"