OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Sun, 21 Dec 2014 23:44:25 +0000 (08:44 +0900)
committeryasushiito <yas@pen-chan.jp>
Sun, 21 Dec 2014 23:44:25 +0000 (08:44 +0900)
commit20fcd1af26833a94d58fc2f70e1d1d9772ec5596
tree9e35756c5c3fbba8fc55b68230e58a35b3114f4a
parented6c8f3dd0ed56cc3f636e9c0cca25b785ad6027
parent39e4dfc096bb924fec6a18186bf5df55154c9818
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/models/panel_picture.js.coffee