// Small fix in live configurator toolbox
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Timeout increased for translation download #PSCFV-11046
Merge pull request #993 from djfm/bootstrap

// fixed typo in Russian installer
// small fix
// Reverted revert
// small fix
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	modules/themeconfigurator/themeconfigurator.php
New fixtures (en)

(my first commit, yay! :) )
// Small fix
// oops
// delete useless module
// Remove other fonts
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Fixture (en): add description to categories
Fixtures images
// Set to new fixtures
replace new css files location to modules/themeconfigurator/css
Fixtures (en) : category_product