main.inc.php

11 years ago
2a853329
Merge remote-tracking branch 'origin/3.5' into develop · 2a853329
Laurent Destailleur authored 11 years ago
```
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
```
2a853329

History
Merge remote-tracking branch 'origin/3.5' into develop
Laurent Destailleur authored 11 years ago
```
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
```