OSDN Git Service

merge
authoryasushiito <yas@pen-chan.jp>
Tue, 30 Jul 2013 01:37:02 +0000 (10:37 +0900)
committeryasushiito <yas@pen-chan.jp>
Tue, 30 Jul 2013 01:37:02 +0000 (10:37 +0900)
commit3d26243a296405e409d8ae5292efcff436c1d4ab
treec36e750ed98c5f36258482790a30a142789075da
parent0b673714645f020a040465fc6de65870515e7314
parent8ef0d6b0e6908ea6ffd2169556fa52b34a02b214
merge
.gitignore
config/application.rb
config/environment.rb