Merge branch 'master' into rails5_upgrade

This commit is contained in:
James Mason 2017-12-08 09:22:01 -08:00 • committed by GitHub
commit 4df6be16c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -79,6 +79,9 @@ $(function () {
$("#conference-start-datepicker").on("dp.change",function (e) {
$('#conference-end-datepicker').data("DateTimePicker").setMinDate(e.date);
if (!$('#conference-end-datepicker').val()) {
$('#conference-end-datepicker').data("DateTimePicker").setDate(e.date);
}
});
$("#conference-start-datepicker").change(function (e) {