Permalink
Browse files

Merge branch 'master' of https://github.com/jmagnusson/the-olumpics

  • Loading branch information...
2 parents 54a91d2 + 4f65d29 commit dec8b0322c21b8b06a8537b1f8832eb88be954fc @AlexxHansson AlexxHansson committed Feb 22, 2014
Showing with 1 addition and 0 deletions.
  1. +1 −0 gui/app/scripts/index.coffee
@@ -1,5 +1,6 @@
console.log('hey')
_ = require('lodash')
+$ = require('jquery')
io = require('socket.io-client')
fs = require('fs')
chooseCharacterTmpl = fs.readFileSync(__dirname + '/templates/choose-character.html')

0 comments on commit dec8b03

Please sign in to comment.