OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Thu, 20 Aug 2015 09:00:48 +0000 (18:00 +0900)
committeryasushiito <yas@pen-chan.jp>
Thu, 20 Aug 2015 09:00:48 +0000 (18:00 +0900)
commit18a9968f3ae8f024ba24f917969ac541ef403a5e
tree3176ad622745462d1dd4d3826b5f1b41907264b8
parent5311097b7883c5e7eed0a5b2ce739ea2ae894c76
parente05f18d1db38e531e7bca45d4ba8db71b082402f
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/view/layout.js.coffee
app/assets/javascripts/views/scrolls/play.js.coffee