Commit 1adfba1a authored by John Crepezzi's avatar John Crepezzi
Browse files

Merge branch 'master' into production

parents c00477c9 54e55b1b
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ to do things like:
which will output a URL to share containing the contents of `cat something`'s
STDOUT.  Check the README there for more details and usages.

## Support

Please consider paying what you feel this project is worth:

<a href="https://www.stripeme.com/pay/1r2f">
  <img alt="Pay" src="https://www.stripeme.com/pay.jpg" />
</a>

## Tested Browsers

* Firefox 8
+1 −1
Original line number Diff line number Diff line
@@ -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'
  md: 'markdown', txt: '', coffee: 'coffee', json: 'js'
};

// Look up the extension preferred for a type