Merge branch 'master' into polls

2017-04-06 14:16:49 +02:00
parent 06fe88b7ec 70bb08564f
commit 6bbcc71ecb
118 changed files with 1294 additions and 748 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,8 +12,8 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui/datepicker
-//= require jquery-ui/datepicker-es
+//= require jquery-ui/widgets/datepicker
+//= require jquery-ui/i18n/datepicker-es
 //= require foundation
 //= require turbolinks
 //= require ckeditor/loader