OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)
committeryasushiito <yas@pen-chan.jp>
Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)
commit3b1bdc62cc8471efd44ced48e95a9aed7a5ee2ee
tree188d66e32b63e8dd7bd9256e38959178362c1930
parent13dc1176bce676f02e571a0f3c38a272de6940a7
parent3d0b0437a9909484d13928d3ffae0dd332c630d7
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/pettanr.js.coffee
app/views/top/index.html.erb