Merge branch 'delivery'

Conflicts:
	composer.lock
	install/insert.sql
This commit is contained in:
Manuel Raynaud
2013-09-07 16:37:54 +02:00
23 changed files with 669 additions and 51 deletions

View File

@@ -803,6 +803,7 @@ CREATE TABLE `module`
`type` TINYINT NOT NULL,
`activate` TINYINT,
`position` INTEGER,
`full_namespace` VARCHAR(255),
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),