OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 7 Jun 2013 06:25:18 +0000 (15:25 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 7 Jun 2013 06:25:18 +0000 (15:25 +0900)
commit648d6b612cfe74fa9c3e27b2c25e07178eac6e34
treecf028d0fe7c62293aa9f47ef5b120109b17e3afc
parent2bb028878ce65185df4dd26927d7849635707c3b
parente6ae2d4d0e9cec1828ef7e4bec617d7f925d8133
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/controllers/ground_pictures_controller.rb
app/models/ground_color.rb
app/models/ground_picture.rb
app/models/panel.rb
app/models/panel_picture.rb
app/views/authors/ground_pictures.html.erb
app/views/ground_pictures/index.html.erb
app/views/home/ground_pictures.html.erb