TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
This commit is contained in:
Etienne Roudeix
2013-08-21 09:19:56 +02:00
parent 6a14bef3de a0b82879f5
commit 86b11096ba
3275 changed files with 929970 additions and 274940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/api/reports/deprecated.html Normal file → Executable file
View File

@@ -143,7 +143,7 @@
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on August 8th, 2013 at 18:12.
on August 16th, 2013 at 09:44.
</section>
</section>
</section>

3611
documentation/api/reports/errors.html Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

92
documentation/api/reports/markers.html Normal file → Executable file
View File

File diff suppressed because one or more lines are too long