merge master

This commit is contained in:
Michael Ball 2020-12-04 01:17:39 -08:00
commit 2892a56a1c
12 changed files with 70 additions and 70 deletions

View file

@ -13,8 +13,8 @@
//= require jquery
//= require jquery_ujs
//= require jquery.mobile.custom.min
//= require jquery.ui.draggable
//= require jquery.ui.droppable
//= require jquery-ui/widgets/draggable
//= require jquery-ui/widgets/droppable
//= require waypoints/jquery.waypoints
//= require datatables/jquery.dataTables