Stephen Bégay d2b785fab7 Merge branch 'master' of https://github.com/locomotivemtl/locomotive-boilerplate ...

Conflicts:
	www/modules/boilerplate/code/boilerplate.template.controller.php

2015-05-26 21:50:39 -04:00

..

config

Fix merge conflicts

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

modules/boilerplate

Merge branch 'master' of https://github.com/locomotivemtl/locomotive-boilerplate

2015-05-26 21:50:39 -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

favicon.ico

Change favicon links and images & change .html name

2015-04-21 10:16:47 -04:00

home.html

Change favicon links and images & change .html name

2015-04-21 10:16:47 -04:00

index.php

Move project-x to www

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