OSDN Git Service

Merge branch 'v04' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v04
authoryasushiito <yas@pen-chan.jp>
Tue, 6 Nov 2012 23:14:17 +0000 (08:14 +0900)
committeryasushiito <yas@pen-chan.jp>
Tue, 6 Nov 2012 23:14:17 +0000 (08:14 +0900)
1  2 
app/views/layouts/test.html.erb

Simple merge