OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Wed, 23 Apr 2014 02:54:22 +0000 (11:54 +0900)
committeryasushiito <yas@pen-chan.jp>
Wed, 23 Apr 2014 02:54:22 +0000 (11:54 +0900)
commit17717b9db2cd9f094e4daf7b7a213c838736746d
tree6866b201688bd2fabfdf8643a0cc6db05eb6daff
parent5204ac22e62cbed768f27d5e7ea42cc85123f1c2
parent7a59e540ef3d13604ec34ecd1596a74e95635a5b
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/manifest/work/items.js.coffee.erb
lib/locmare/booster.rb
public/manifest.json