OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)
committeryasushiito <yas@pen-chan.jp>
Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)
commitcae8637dae02578dca8698fccd6dc23c07c3a9fd
tree77a8541fe81fe8cb90c8f4668cbadb64a1a58d0e
parenteaa552749ac347007bf8cf34e352282397c02779
parente671997e4bbedef2a52d5b9acf219a260a457d4b
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/models/balloon.rb
app/models/speech.rb