OSDN Git Service

Merge branch 'v04' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v04license
authoryasushiito <yas@pen-chan.jp>
Sat, 30 Jun 2012 03:44:09 +0000 (12:44 +0900)
committeryasushiito <yas@pen-chan.jp>
Sat, 30 Jun 2012 03:44:09 +0000 (12:44 +0900)
commitefd817c2dbd6c7b98352306dccdb5f272ca5c67c
tree0d63df2f7e3116c7ecc7de4f0783c59f31bca4e1
parentf503817fa11fe7cf381b9c073bd26ea27bae375b
parent809beb5cd929c25f2d0ea1c3edd536d8d682c3a4
Merge branch 'v04' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v04license
spec/models/artist_spec.rb
spec/models/original_picture_spec.rb
spec/models/panel_spec.rb
spec/models/resource_picture_spec.rb