OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 18 Apr 2014 07:10:07 +0000 (16:10 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 18 Apr 2014 07:10:07 +0000 (16:10 +0900)
commitca071ae6b2bc69089d48271a717dc775a77fc380
tree19c48c93a9cbdd1d91770159084595b8484a8f21
parent40e590105ff1c1ce18ecf3c8aec0e3e5087ae7a8
parent0b7174946e26683127e4b4eebda9a2cf87e64b78
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
Gemfile
app/assets/javascripts/manifest/work/forms.js.coffee.erb
public/local_manifest.json