Manuel Raynaud
|
1974d3e3c3
|
fix psr
|
2014-01-22 12:52:36 +01:00 |
|
Manuel Raynaud
|
0c24a8afc0
|
Merge branch 'master' into modules
Conflicts:
templates/backOffice/default/product-edit.html
|
2013-12-17 10:48:59 +01:00 |
|
Manuel Raynaud
|
d6b524e39a
|
add a new entry point in each pages in bo for js include
|
2013-12-17 10:21:18 +01:00 |
|
Franck Allimant
|
e96088080d
|
Merge branch 'master' into modules
|
2013-12-06 17:16:14 +01:00 |
|
Etienne Roudeix
|
b0371312e2
|
assets in modules
|
2013-11-28 11:47:21 +01:00 |
|
gmorel
|
dc648fef62
|
Merge master
|
2013-11-27 20:24:38 +01:00 |
|
Etienne Roudeix
|
25192cf366
|
change template subdirs
|
2013-11-13 10:24:14 +01:00 |
|