OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)
committeryasushiito <yas@pen-chan.jp>
Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)
commit6945f99e15e7ac499dc52e7af30fbff1499a6e78
tree9eda7a10b17f4b83f65bd0e4087d527f7044f72f
parent2c135f0da2f6e8e2bbd8f7223d39b780e327df4b
parente9239d853f803c86df3a230e4d113c66833ecc71
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/manifest/work/items.js.coffee.erb
public/manifest.json