Mathieu Ducharme b11283fb91 Fix merge conflicts

2015-03-16 10:07:25 -04:00

..

config

Fix merge conflicts

2015-03-16 10:07:25 -04:00

modules/boilerplate

Fix merge conflicts

2015-03-16 10:07:25 -04:00

.editorconfig

Move project-x to www

2015-03-13 17:48:15 -04:00

.htaccess

Move project-x to www

2015-03-13 17:48:15 -04:00

charcoal.php

Move project-x to www

2015-03-13 17:48:15 -04:00

index.html

Fix merge conflicts

2015-03-16 10:07:25 -04:00

index.php

Move project-x to www

2015-03-13 17:48:15 -04:00