OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 14 Mar 2014 09:40:07 +0000 (18:40 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 14 Mar 2014 09:40:07 +0000 (18:40 +0900)
commit258a61bf827e2298861d01b564026d41286754f2
tree655727d00d0a84ecf0814d4525d8d48a20f93a9e
parentb4cc64119fff4ee29027579a6203fcd061c78cb3
parent610257311287236d2abb7d13d048d51e7701cbbd
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/manifest/work/models.js.coffee.erb
public/manifest.json