diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-23 22:53:04 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-23 22:53:04 -0400 |
| commit | a6f801b7f5a2b9ca1b61ecc305a31f76be8c8238 (patch) | |
| tree | 6f9fe728220b8d7d08e9da3ac3ac48f3a3128d5b /app/assets/javascripts/application.js | |
| parent | 107f1f65c93cbe118a69e76514327c4862c7d51d (diff) | |
| parent | 41a93fad32677e3f351c0e16f0c704cbfbc5404e (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/assets/javascripts/application.js')
| -rw-r--r-- | app/assets/javascripts/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e9430a3..1130838 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,4 +17,4 @@ //= require 'dragsort.js' //= require 'coordinates.js' // -//= require_tree ./common +//= require_tree ./application |