Webionite
/
haste-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into production

This commit is contained in:
John Crepezzi 2012-12-19 08:18:14 -05:00
parent 1adfba1a37 46bdd27431
commit 82c58c5c0c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/application.js
View File

@ -168,7 +168,7 @@ haste.extensionMap = {
lua: 'lua', pas: 'delphi', java: 'java', cpp: 'cpp', cc: 'cpp', m: 'objectivec',
vala: 'vala', cs: 'cs', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini',
diff: 'diff', bash: 'bash', sh: 'bash', tex: 'tex', erl: 'erlang', hs: 'haskell',
md: 'markdown', txt: '', coffee: 'coffee', json: 'js'
md: 'markdown', txt: '', coffee: 'coffee', json: 'javascript'
};
// Look up the extension preferred for a type

2
static/application.min.js vendored
View File

File diff suppressed because one or more lines are too long