Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

2017-08-24 18:04:57 +06:30
parent 81f430b5c6 9327cb7169
commit 1f7ba42e80
25 changed files with 412 additions and 222 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -4,6 +4,7 @@
@import "theme";
@import "jquery-ui";
@import "bootstrap-datepicker3";
+@import "jquery.datetimepicker";

 /* Show it is fixed to the top */
 // body {
@@ -75,5 +76,3 @@ select.form-control {
 }

 /*--- Reset --- */
-
-