OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 6 Feb 2015 01:27:45 +0000 (10:27 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 6 Feb 2015 01:27:45 +0000 (10:27 +0900)
commit5dd43ec71dd1d0a06a91c4b0c6b60ef0db9c5d0e
tree1567a67bae0ea8d468c21e730d2dcc4585607fb9
parentb7655c10d5a9dbcf3564251d1ac6474caf083566
parent212ea3898c23ac709a3548f92f444c5a77ae4ce2
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/views/balloons/show.js.coffee
app/assets/javascripts/views/ground_colors/show.js.coffee
app/assets/javascripts/views/ground_pictures/show.js.coffee
app/assets/javascripts/views/panel_pictures/show.js.coffee