aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts/application.js
diff options
context:
space:
mode:
authorMarc Florisson2014-01-22 17:41:04 +0100
committerMarc Florisson2014-01-22 17:41:04 +0100
commitc9437fc2e96f415e38c1e72fa10337769381f289 (patch)
tree199b39a7c8c5cc2cfef539f73f73c1b5fbea8a72 /app/assets/javascripts/application.js
parent4e71abdc01f9f04ce6eec1989fa756ffc823fd65 (diff)
downloadchouette-core-c9437fc2e96f415e38c1e72fa10337769381f289.tar.bz2
merge branch validation
Diffstat (limited to 'app/assets/javascripts/application.js')
-rw-r--r--app/assets/javascripts/application.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 69d083fe7..6b7b38a3a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,5 +9,6 @@
//= require jquery-ui
//= require modernizr
//= require cocoon
-//= require_directory ./public
+//= require raphael
+//= require morris
//= require_directory .