OSDN Git Service

conflict
authoryasushiito <yas@pen-chan.jp>
Thu, 1 Oct 2015 01:11:27 +0000 (10:11 +0900)
committeryasushiito <yas@pen-chan.jp>
Thu, 1 Oct 2015 01:11:27 +0000 (10:11 +0900)
commit6feb1c7f35b819955c56b14b6cfb7d1c21c0cffa
tree0d0eef02c34ebaa8a46a89e59b820616e3a774d6
parentf522407ab18ef79c237ed4dfe2f3bbb590d1b42e
parente633f76da3c7443f7a0b7278e95add0db51f4bf4
conflict
app/assets/javascripts/views/scrolls/play.js.coffee