OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Thu, 14 May 2015 09:10:05 +0000 (18:10 +0900)
committeryasushiito <yas@pen-chan.jp>
Thu, 14 May 2015 09:10:05 +0000 (18:10 +0900)
commit3025d9c8e165eabe6eb774cf92760c5a049b0c2b
tree7331749e1d941a3d1384808214319137356f7a3a
parentc2a913ce5fa7c2eeb6d787727f1c4cac7b404906
parentb4e78f1cb6feae47a01962183d70d19f67e8d370
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/work/forms.js.coffee.erb
app/assets/javascripts/yasapp.js
public/local_manifest.json