Merge branch 'master' into modules

Browse Source

...

This commit is contained in:

Franck Allimant

2013-12-06 17:16:14 +01:00

parent 1416265053 0fcbb409e3

commit e96088080d

316 changed files with 4064 additions and 1708 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

templates/backOffice/default/includes/module-block.html Normal file → Executable file