Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

1
2
3
-- --------------------------------------------------------
 
ALTER TABLE `web_domain` ADD `web_folder` VARCHAR( 100 ) DEFAULT NULL AFTER `document_root` ;