diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
| commit | 9d6dc1e5959590eeca5f9ea19cf731d73c735bd6 (patch) | |
| tree | fd135e0f543a7f78388c91992fcfa85b5b7564dd /app/assets/javascripts/application.js | |
| parent | b2ceff6667461a6db587c4077ef56bdb4fe9f44b (diff) | |
| parent | 21d6ddb3b2e85fa24f331dbf547133a34b0d37bd (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/assets/javascripts/application.js')
| -rw-r--r-- | app/assets/javascripts/application.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cb6edeb..e9430a3 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,7 +13,8 @@ //= require jquery //= require jquery_ujs //= require turbolinks -//= require_tree . //= require 'drag.js' //= require 'dragsort.js' //= require 'coordinates.js' +// +//= require_tree ./common |