Merge branch 'master' into 2-0-stable-Mar6

This commit is contained in:
luisramos0
2019-03-06 09:19:53 +00:00
79 changed files with 7134 additions and 3387 deletions

View File

@@ -8,8 +8,8 @@
//= require jquery
//= require jquery-migrate-min
//= require jquery_ujs
//= require jquery.ui.all
//= require shared/jquery-ui-timepicker-addon
//= require jquery-ui
//= require jquery-ui-timepicker-addon
//= require angular
//= require angular-resource
//= require angular-animate