Skip to content

Commit

Permalink
Merge branch 'cli' of github.com:isao/mojito into cli
Browse files Browse the repository at this point in the history 
Conflicts:
	lib/app/archetypes/app/hybrid/application.json.hb
  • Loading branch information
Isao Yagi committed Oct 12, 2012
2 parents 469bbfe + 8f1d367 commit afc59e8
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit afc59e8

Please sign in to comment.