show.erb追加
Merge branch 'master' of github.com:dulltz/Study-Padrino
fixed
Merge branch 'master' of github.com:dulltz/Study-Padrino
hoge!
Merge branch 'kaito-client' of github.com:dulltz/Study-Padrino