Merge branch '1c' of github.com:imagecms/ImageCMS into 1c
1
Merge branch '1c' of github.com:imagecms/ImageCMS into 1c
1c module new settings interface
category import done
properties import done
products import done
fix ERP commmit
Merge branch 'master' of github.com:imagecms/ImageCMS
fix more
edit .gitignore
merge with US76
empty
added image resize, orders import
remove to trash
remove to trash
exchange autoload fixed
CMSFactory Update
merge 1C with master
merge