Merge branch 'master' into '1.0'

Select2js allow clear



See merge request !3
This commit is contained in:
Julien Fastré 2015-12-15 11:01:04 +01:00
commit 590762889b

View File

@ -166,7 +166,7 @@
chill.initPikaday('{{ app.request.locale }}'); chill.initPikaday('{{ app.request.locale }}');
chill.emulateSticky(); chill.emulateSticky();
chill.checkOtherValueOnChange(); chill.checkOtherValueOnChange();
$('.select2').select2(); $('.select2').select2({allowClear: true});
</script> </script>
{% block js%}<!-- nothing added to js -->{% endblock %} {% block js%}<!-- nothing added to js -->{% endblock %}