Stephen 9d48064b58 Merge branch 'master' of https://github.com/stephenbe/locomotive-boilerplate ...

Conflicts:
	project-x/Gruntfile.js
	project-x/assets/styles/dist/main.css
	project-x/assets/styles/src/_import.scss
	project-x/assets/styles/src/base/_base.scss
	project-x/assets/styles/src/base/_forms.scss

2014-10-02 10:02:17 -04:00

..

assets

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

2014-10-02 10:02:17 -04:00

.csscomb.json

make sass and csscomb work

2014-10-01 17:55:55 -04:00

Gruntfile.js

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

2014-10-02 10:02:17 -04:00

index.html

sass stuff

2014-09-30 15:59:23 -04:00

package.json

make sass and csscomb work

2014-10-01 17:55:55 -04:00