diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
commit | e4ae559d8189519586e044238196ee45b2a10c6b (patch) | |
tree | 3d4977292aa234ea93ce604095f13d50484250a1 /app/assets/javascripts/matches.js.coffee | |
parent | 2f450dd30bb210fdc4cb8899c72e6da945a163ba (diff) | |
parent | da95cb4f0f48731c2713c61f17b522b048647fd1 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/layouts/application.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/assets/javascripts/matches.js.coffee')
-rw-r--r-- | app/assets/javascripts/matches.js.coffee | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/matches.js.coffee b/app/assets/javascripts/matches.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/matches.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ |