aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2019-05-12 20:13:17 +0200
committerHarald Eilertsen <haraldei@anduin.net>2019-05-12 20:13:17 +0200
commitac2f6e26c6a0471fd6e587b588710405ec3829db (patch)
treec94b47981eda4a8df3cfb53b491edc4ff2637c3f /app
parentf45b0bcea8f7be35eb80e5080fd4addd0c8f9d50 (diff)
parent5a6460a6101819cc7834612649b48961f5d16d20 (diff)
downloadhmnoweb-ac2f6e26c6a0471fd6e587b588710405ec3829db.tar.gz
hmnoweb-ac2f6e26c6a0471fd6e587b588710405ec3829db.tar.bz2
hmnoweb-ac2f6e26c6a0471fd6e587b588710405ec3829db.zip
Merge branch 'fix-banners' into dev
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/application.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9097d83..0a7cfbd 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,4 +12,6 @@
//
//= require jquery
//= require jquery_ujs
+//= require banners/banners
+//= require banners/jquery.tristate
//= require_tree .