OSDN Git Service

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
authoryasushiito <yas@pen-chan.jp>
Tue, 10 Feb 2015 08:11:59 +0000 (17:11 +0900)
committeryasushiito <yas@pen-chan.jp>
Tue, 10 Feb 2015 08:11:59 +0000 (17:11 +0900)
commit2078c3e72dc259899b9e98d77ad757c9fb6d4f0e
treede73b9b664402dea1fa08287c5012f59a4a26f25
parentb5b5fe7a5c2e1e7705bd43b1e1fcdd70228dedf3
parent34302e1ed29b8f70d9849bb059bb37383ec38e24
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
app/assets/javascripts/controllers/users.js.coffee
app/assets/javascripts/views/users/account.js.coffee