Merge remote-tracking branch 'origin/imgbot'

# Conflicts: # src/main/resources/static/fonts/ElegantIcons.svg # src/main/resources/static/fonts/fontawesome-webfont.svg # src/main/resources/static/fonts/themify.svg # src/main/resources/static/images/404.png # src/main/resources/static/images/b3.png # src/main/resources/static/images/close.png # src/main/resources/static/images/ftr-icons.png # src/main/resources/static/images/icon.png # src/main/resources/static/images/login.jpg # src/main/resources/static/images/mess.png # src/main/resources/static/images/next.png # src/main/resources/static/images/p1.png # src/main/resources/static/images/p2.png # src/main/resources/static/images/p3.png # src/main/resources/static/images/p4.png # src/main/resources/static/images/p5.png # src/main/resources/static/images/p6.png # src/main/resources/static/images/p7.png # src/main/resources/static/images/p8.png # src/main/resources/static/images/prev.png # src/main/resources/static/images/pro1.jpg # src/main/resources/static/images/pro10.jpg # src/main/resources/static/images/pro2.jpg # src/main/resources/static/images/pro3.jpg # src/main/resources/static/images/pro4.jpg # src/main/resources/static/images/pro5.jpg # src/main/resources/static/images/pro6.jpg # src/main/resources/static/images/pro7.jpg # src/main/resources/static/images/pro8.jpg # src/main/resources/static/images/pro9.jpg # src/main/resources/static/images/reg.png # src/main/resources/static/images/search.png # src/main/resources/static/images/shoppy.jpg # src/main/resources/static/images/tick.png # src/main/resources/static/images/visit.png
Baneeishaque · May 29, 2020 · a692512 · a692512
2 parents e3c7d49 + 835602e
commit a692512
Show file tree

Hide file tree

Showing 58 changed files with 0 additions and 0 deletions.
diff --git a/html_site_template_customer/fashi/img/banner-1.jpg b/html_site_template_customer/fashi/img/banner-1.jpg
diff --git a/html_site_template_customer/fashi/img/banner-2.jpg b/html_site_template_customer/fashi/img/banner-2.jpg
diff --git a/html_site_template_customer/fashi/img/banner-3.jpg b/html_site_template_customer/fashi/img/banner-3.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-1.jpg b/html_site_template_customer/fashi/img/blog/blog-1.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-2.jpg b/html_site_template_customer/fashi/img/blog/blog-2.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-3.jpg b/html_site_template_customer/fashi/img/blog/blog-3.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-4.jpg b/html_site_template_customer/fashi/img/blog/blog-4.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-5.jpg b/html_site_template_customer/fashi/img/blog/blog-5.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-6.jpg b/html_site_template_customer/fashi/img/blog/blog-6.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-detail-1.jpg b/html_site_template_customer/fashi/img/blog/blog-detail-1.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-detail-2.jpg b/html_site_template_customer/fashi/img/blog/blog-detail-2.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-detail-3.jpg b/html_site_template_customer/fashi/img/blog/blog-detail-3.jpg
diff --git a/html_site_template_customer/fashi/img/blog/blog-detail.jpg b/html_site_template_customer/fashi/img/blog/blog-detail.jpg
diff --git a/html_site_template_customer/fashi/img/blog/next-blog.png b/html_site_template_customer/fashi/img/blog/next-blog.png
diff --git a/html_site_template_customer/fashi/img/blog/post-by.png b/html_site_template_customer/fashi/img/blog/post-by.png
diff --git a/html_site_template_customer/fashi/img/blog/prev-blog.png b/html_site_template_customer/fashi/img/blog/prev-blog.png
diff --git a/html_site_template_customer/fashi/img/cart-page/product-2.jpg b/html_site_template_customer/fashi/img/cart-page/product-2.jpg
diff --git a/html_site_template_customer/fashi/img/footer-logo.png b/html_site_template_customer/fashi/img/footer-logo.png
diff --git a/html_site_template_customer/fashi/img/hero-1.jpg b/html_site_template_customer/fashi/img/hero-1.jpg
diff --git a/html_site_template_customer/fashi/img/hero-2.jpg b/html_site_template_customer/fashi/img/hero-2.jpg
diff --git a/html_site_template_customer/fashi/img/hero-3.jpg b/html_site_template_customer/fashi/img/hero-3.jpg
diff --git a/html_site_template_customer/fashi/img/icon-1.png b/html_site_template_customer/fashi/img/icon-1.png
diff --git a/html_site_template_customer/fashi/img/icon-2.png b/html_site_template_customer/fashi/img/icon-2.png
diff --git a/html_site_template_customer/fashi/img/icon-3.png b/html_site_template_customer/fashi/img/icon-3.png
diff --git a/html_site_template_customer/fashi/img/insta-2.jpg b/html_site_template_customer/fashi/img/insta-2.jpg
diff --git a/html_site_template_customer/fashi/img/insta-3.jpg b/html_site_template_customer/fashi/img/insta-3.jpg
diff --git a/html_site_template_customer/fashi/img/insta-4.jpg b/html_site_template_customer/fashi/img/insta-4.jpg
diff --git a/html_site_template_customer/fashi/img/insta-5.jpg b/html_site_template_customer/fashi/img/insta-5.jpg
diff --git a/html_site_template_customer/fashi/img/insta-6.jpg b/html_site_template_customer/fashi/img/insta-6.jpg
diff --git a/html_site_template_customer/fashi/img/latest-1.jpg b/html_site_template_customer/fashi/img/latest-1.jpg
diff --git a/html_site_template_customer/fashi/img/latest-2.jpg b/html_site_template_customer/fashi/img/latest-2.jpg
diff --git a/html_site_template_customer/fashi/img/latest-3.jpg b/html_site_template_customer/fashi/img/latest-3.jpg
diff --git a/html_site_template_customer/fashi/img/logo-carousel/logo-1.png b/html_site_template_customer/fashi/img/logo-carousel/logo-1.png
diff --git a/html_site_template_customer/fashi/img/logo-carousel/logo-2.png b/html_site_template_customer/fashi/img/logo-carousel/logo-2.png
diff --git a/html_site_template_customer/fashi/img/logo-carousel/logo-3.png b/html_site_template_customer/fashi/img/logo-carousel/logo-3.png
diff --git a/html_site_template_customer/fashi/img/logo-carousel/logo-4.png b/html_site_template_customer/fashi/img/logo-carousel/logo-4.png
diff --git a/html_site_template_customer/fashi/img/logo-carousel/logo-5.png b/html_site_template_customer/fashi/img/logo-carousel/logo-5.png
diff --git a/html_site_template_customer/fashi/img/logo.png b/html_site_template_customer/fashi/img/logo.png
diff --git a/html_site_template_customer/fashi/img/payment-method.png b/html_site_template_customer/fashi/img/payment-method.png
diff --git a/html_site_template_customer/fashi/img/product-single/avatar-1.png b/html_site_template_customer/fashi/img/product-single/avatar-1.png
diff --git a/html_site_template_customer/fashi/img/product-single/product-1.jpg b/html_site_template_customer/fashi/img/product-single/product-1.jpg
diff --git a/html_site_template_customer/fashi/img/product-single/tab-desc.jpg b/html_site_template_customer/fashi/img/product-single/tab-desc.jpg
diff --git a/html_site_template_customer/fashi/img/products/man-1.jpg b/html_site_template_customer/fashi/img/products/man-1.jpg
diff --git a/html_site_template_customer/fashi/img/products/man-2.jpg b/html_site_template_customer/fashi/img/products/man-2.jpg
diff --git a/html_site_template_customer/fashi/img/products/man-4.jpg b/html_site_template_customer/fashi/img/products/man-4.jpg
diff --git a/html_site_template_customer/fashi/img/products/man-large.jpg b/html_site_template_customer/fashi/img/products/man-large.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-1.jpg b/html_site_template_customer/fashi/img/products/product-1.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-2.jpg b/html_site_template_customer/fashi/img/products/product-2.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-3.jpg b/html_site_template_customer/fashi/img/products/product-3.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-4.jpg b/html_site_template_customer/fashi/img/products/product-4.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-5.jpg b/html_site_template_customer/fashi/img/products/product-5.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-6.jpg b/html_site_template_customer/fashi/img/products/product-6.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-7.jpg b/html_site_template_customer/fashi/img/products/product-7.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-8.jpg b/html_site_template_customer/fashi/img/products/product-8.jpg
diff --git a/html_site_template_customer/fashi/img/products/product-9.jpg b/html_site_template_customer/fashi/img/products/product-9.jpg
diff --git a/html_site_template_customer/fashi/img/products/women-1.jpg b/html_site_template_customer/fashi/img/products/women-1.jpg
diff --git a/html_site_template_customer/fashi/img/products/women-4.jpg b/html_site_template_customer/fashi/img/products/women-4.jpg
diff --git a/html_site_template_customer/fashi/img/time-bg.jpg b/html_site_template_customer/fashi/img/time-bg.jpg