Skip to content

Commit

Permalink
Merge branch 'lab-01-project-setup-solved' into lab-02-first-componen…
Browse files Browse the repository at this point in the history
…t-start

* lab-01-project-setup-solved:
  better welcome

Conflicts:
	api/views/index.jade
  • Loading branch information
brucecoddington committed Mar 16, 2015
2 parents dfcfe57 + 8f6ec9a commit 79e5fa6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
`npm install`

## Gulp Tasks ##
### These are all the Gulp.js tasks in their entirety: ###
### These are the Gulp.js tasks for your dev process: ###

* `gulp init` - Runs the Semantic UI build.

Expand Down

0 comments on commit 79e5fa6

Please sign in to comment.