Merge branch 'r-1902001-01' into foodcourt

2020-08-26 11:03:03 +06:30
parent 38a01a8bde a226a39d08
commit e0cbe57245
41 changed files with 1592 additions and 1153 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -13,6 +13,7 @@
@import "reset";
@import "induties/assign_in_duties";
@import "select2";
+@import "select2-material";

 /*@import "bootstrap-select/css/bootstrap-select.min";*/