From f7f32c35f88e73a08f21b8a3e0585f08a964fec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Chans=C3=A9aume?= <jchanseaume@openstudio.fr>
Date: Fri, 1 Aug 2014 09:58:47 +0200
Subject: [PATCH] Updated Changelog

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad7250484..b178114ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,21 @@
 - Fix bugs on customer change password form and module "order by title"
 - Add the ability to place a firewall on forms. To use this in a module, extend Thelia\Form\FirewallForm instead of BaseForm
 - Add Exports and Imports management
+- Default front office template:
+     - Display enhancement
+     - Optimization of the uses of Thelia loops to gain performances and consistency
+     - Optimization for SEO : meta description fallback, ti>>>>>>> Updated Changelog
+tle on category page, ...
+     - new PSE layout in product page, attributes are separated
+     - Support of 'check-available-stock' config variable
+     - Terms and conditions agreement is now in the order process
+- Default pdf template:
+     - Added list of amount by tax rule
+     - Display enhancement
+     - Added legal information about the store
+- Demo:
+     - Support for brand
+     - Added folders and contents data.
 
 #2.0.2
 - Coupon UI has been redesigned.