summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorRosemary Sanchez <rsanchez@madebyuppercut.com>2013-07-29 16:08:22 -0700
committerRosemary Sanchez <rsanchez@madebyuppercut.com>2013-07-29 16:08:22 -0700
commitc69a7be929e50678c92bd7a7114788de13ee3d74 (patch)
tree216d2f82b085e91664460cb0184f7e09fc41e568 /app/assets/javascripts
parent9c889028be05270f3cfef1e926c75da2882bafe4 (diff)
parent6a09ffd2d395ae3102cca7cc8168c78b3707d8e1 (diff)
Merge pull request #17 from madebyuppercut/ty
Ty
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e3a9f2d..921aebe 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,5 +13,4 @@
//= require jquery
//= require jquery_ujs
//= require bootstrap
-//= require turbolinks
//= require_tree .