summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2012-11-19 13:33:23 -0800
committerjessib <jessib@leap.se>2012-11-19 13:33:23 -0800
commit347eb4b20cbe740485dd9d1d7220c01eef659920 (patch)
treeb004aaede235d7c6d2bbd63b8bed5f42d2bce290 /app/assets/javascripts
parent341da14b031c3c27e687c82f479624217c1dbddd (diff)
parent172317b35d9c7ae26a6bf4836feace7b509644a6 (diff)
Merge branch 'develop' into help_develop
Conflicts: app/assets/javascripts/application.js ui_dependencies.rb
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 36a9979..23d7fef 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,4 +20,6 @@
$(function() {
$('a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax('[data-pjax-container]');
-}); \ No newline at end of file
+});
+//= require rails.validations
+//= require rails.validations.simple_form