OSDN Git Service

Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05i18n
authoryasushiito <yas@pen-chan.jp>
Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)
committeryasushiito <yas@pen-chan.jp>
Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)
commit339d45c101d93bf611299e3c90f3883f28937c2b
tree14788ce3bceeba70ee2cb2367ecdf8a854f4888a
parent17c2db5be9b164e2975a55e2818b4d7ea181d838
parent17f403126a44f4c9a675525ccb76e6daca28a357
Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05i18n
config/locales/pettanr.ja.yml
config/routes.rb