12 Commits

Include renames

Author	SHA1	Message	Date
Jerome Nadaud	639a56421a	// Themeconfigurator	2013-11-18 22:16:26 +01:00
Jerome Nadaud	f2b5e6de51	// Themeconfigurator and homeslider	2013-11-18 20:49:52 +01:00
Jerome Nadaud	57b329ca74	// Remove other fonts	2013-11-18 17:46:05 +01:00
Jerome Nadaud	c14b9e619d	Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ... Conflicts: modules/themeconfigurator/themeconfigurator.php	2013-11-18 17:21:41 +01:00
Jerome Nadaud	938ef4fe39	// small fix	2013-11-18 17:12:35 +01:00
rGaillard	5d0b188eed	// small fix	2013-11-18 16:19:02 +01:00
Jerome Nadaud	89c9f182b3	// Small fix in live configurator toolbox	2013-11-18 15:35:03 +01:00
Jerome Nadaud	867eef79cc	// Add live configurator toolbox - Part 1	2013-11-18 14:39:46 +01:00
TMMeilleur	0d1c113be1	updates and fixes 14.11.2013	2013-11-14 18:08:05 +02:00
alexey-svistunov	6f5c9044d3	Added changes from eb94b51 TMMeilleur/PrestaShop	2013-11-08 21:00:00 +02:00
Rémi Gaillard	3edaee1313	// themeconfigurator	2013-11-05 19:07:42 +01:00
Rémi Gaillard	65a41a9f7a	// theme configurator	2013-11-05 18:49:21 +01:00