OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)
commit0174862d186425888ff64ffe1fa52c6266708049
tree67b00fe9ddaa49fd53d4fad2f74d3ba1fb6fa329
parentb0a5d3f3d8c21fcdaabd1be05f0cfb73a7395f09
parent2da8bab7a36eb0ca1df4ca0dc1a25db928561be8
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/manifest/work/controllers.js.coffee.erb
app/assets/javascripts/manifest/work/list_groups.js.coffee.erb
public/local_manifest.json
public/manifest.json