Merge branch 'master' of github.com:strongloop/asteroid

Conflicts:
	lib/application.js
This commit is contained in:
Ritchie 2013-06-17 08:04:37 -07:00
commit 4582ef34dc
1 changed files with 1 additions and 0 deletions

View File

@ -1,4 +1,5 @@
# asteroid # asteroid
v0.7.0 v0.7.0
## Install ## Install