OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)
committeryasushiito <yas@pen-chan.jp>
Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)
commitbb97922e3c1f43e4af22fc8a7c8ebd202e64be82
treeb0c8ee0aef904ea5f0d27d0a7b11ad6a5f7daf0a
parentb5b8c38cc3c593a6e8622332296ccdfc24ae641d
parent68073cb4b181ee63b103a14f366d65461ecf176a
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/models/ground_picture.js.coffee
app/assets/javascripts/models/picture.js.coffee