summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/application.js
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-04-23 22:50:48 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-04-23 22:50:48 -0400
commit41a93fad32677e3f351c0e16f0c704cbfbc5404e (patch)
treeaa46c550dbd15a1f0bb0faf4e8eebb92c4970bdd /app/assets/javascripts/application.js
parent19b04a49d01af1917385c166501ef086eddae437 (diff)
parent47be7c86ca5193ffe4331fbb9358a9171abe748b (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.js2
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