merge with staging

This commit is contained in:
Yan
2017-10-12 09:59:24 +06:30
89 changed files with 1810 additions and 1372 deletions

View File

@@ -42,6 +42,10 @@ Rails.application.config.assets.precompile += %w( fileinput.min.js )
Rails.application.config.assets.precompile += %w( addorder.css )
Rails.application.config.assets.precompile += %w( addorder.js )
# --- Custom SX Themem ----
Rails.application.config.assets.precompile += %w( sx-sidebar.css )
Rails.application.config.assets.precompile += %w( popper.min.js )
# --- Inventory Definition ----
Rails.application.config.assets.precompile += %w( inventory_definitions.css )