OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Thu, 14 May 2015 01:42:17 +0000 (10:42 +0900)
committeryasushiito <yas@pen-chan.jp>
Thu, 14 May 2015 01:42:17 +0000 (10:42 +0900)
commitb4e78f1cb6feae47a01962183d70d19f67e8d370
tree0a2403bd1fe21448d06d2a4f17276d467e47347b
parent6733d61c6f0551647a023be3006cb70901497c36
parent1fd948fbf48d6f1b2f5c34241f0491febf0ba579
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/locmare/form.js.coffee
app/assets/javascripts/work/forms.js.coffee.erb
public/local_manifest.json