1
0
Fork 0

Merge remote branch 'upstream/master'

Conflicts:
	update.php
This commit is contained in:
Michael Vogel 2012-08-02 00:21:14 +02:00
commit 04c31d194f
316 changed files with 18693 additions and 1540 deletions

View file

@ -456,6 +456,7 @@ CREATE TABLE IF NOT EXISTS `hook` (
`hook` char(255) NOT NULL,
`file` char(255) NOT NULL,
`function` char(255) NOT NULL,
`priority` int(11) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;