OSDN Git Service

merge
authoryasushiito <yas@pen-chan.jp>
Sun, 12 Jul 2015 09:59:26 +0000 (18:59 +0900)
committeryasushiito <yas@pen-chan.jp>
Sun, 12 Jul 2015 09:59:26 +0000 (18:59 +0900)
commit0ead3a286b925e86845cf8211982a7985e522813
treebc9e980c63fe68e1be9f8d69bcdff4d83909dd3d
parentc78e83df30c23027e118efec4e88481c3924e39e
parent6ece5276fedeadfef00b556a0658792d44927d81
merge
app/assets/javascripts/peta/item.js.coffee
app/assets/javascripts/yasapp.js