Merge pull request #304 from Silence-WWT/develop

Develop
silencewwt · Dec 10, 2015 · ea6646b · ea6646b
2 parents 378bdd3 + c6c6d7a
commit ea6646b
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 1,158 deletions.
diff --git a/app/static/img/user/search_page_no_items.png b/app/static/img/user/search_page_no_items.png
diff --git a/app/static/js/user/404.bundle.js b/app/static/js/user/404.bundle.js
diff --git a/app/static/js/user/About.bundle.js b/app/static/js/user/About.bundle.js
diff --git a/app/static/js/user/Brand.bundle.js b/app/static/js/user/Brand.bundle.js
diff --git a/app/static/js/user/Brands.bundle.js b/app/static/js/user/Brands.bundle.js
diff --git a/app/static/js/user/Compare.bundle.js b/app/static/js/user/Compare.bundle.js
diff --git a/app/static/js/user/Detail.bundle.js b/app/static/js/user/Detail.bundle.js
diff --git a/app/static/js/user/Furniture.bundle.js b/app/static/js/user/Furniture.bundle.js
diff --git a/app/static/js/user/Home.bundle.js b/app/static/js/user/Home.bundle.js
diff --git a/app/static/js/user/Login.bundle.js b/app/static/js/user/Login.bundle.js
diff --git a/app/static/js/user/Profile.bundle.js b/app/static/js/user/Profile.bundle.js
diff --git a/app/static/js/user/ResetPassword.bundle.js b/app/static/js/user/ResetPassword.bundle.js
diff --git a/app/static/js/user/Search.bundle.js b/app/static/js/user/Search.bundle.js
diff --git a/app/static/js/user/SignedUp.bundle.js b/app/static/js/user/SignedUp.bundle.js
diff --git a/app/static/js/user/commons.bundle.js b/app/static/js/user/commons.bundle.js