OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 13 Mar 2015 02:26:25 +0000 (11:26 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 13 Mar 2015 02:26:25 +0000 (11:26 +0900)
commitff482030f00f9f64761c6e000bcf35c2f23562c9
treea8cce3911d7ac3c4b0fc2b30fd1c9290b246230c
parenta7a6f11f769cd6b07f1db5fec0ce84db6cc51305
parent8f9a7d37c8a4ed534efb560d35aad984beea4161
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/ap.js
app/assets/javascripts/controllers.js.coffee
app/assets/javascripts/pettanr.js.coffee