OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Fri, 20 Mar 2015 09:40:02 +0000 (18:40 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 20 Mar 2015 09:40:02 +0000 (18:40 +0900)
commitbfd70bbe42b6a526ac84254cda52c59b95d8a785
tree079029afb138d8d9ba842ff3d5f82ec89ef35ba0
parent9ae789b099c612bc4ccde2915e397b3b2f7d2592
parent46c48b27d7ea359151135e0327d820a4891981d9
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/controllers.js.coffee
app/assets/javascripts/controllers/panels.js.coffee