OSDN Git Service

t#31558:merge v06
authoryasushiito <yas@pen-chan.jp>
Wed, 19 Jun 2013 10:28:34 +0000 (19:28 +0900)
committeryasushiito <yas@pen-chan.jp>
Wed, 19 Jun 2013 10:28:34 +0000 (19:28 +0900)
commit592aa19184c67289e0a9d11143f50e7b90f2c3cb
treebafcd0c003b6dd13354fa8ebb4acee26dd7335ec
parent9594df49579d3b1eb86c41ea2d38b1fa0b63ec6a
parent17fdb3464638babad4f9b11bd4ddc316333fcca7
t#31558:merge v06
21 files changed:
app/assets/javascripts/panels.js.coffee
app/models/balloon.rb
app/models/ground_color.rb
app/models/ground_picture.rb
app/models/panel_picture.rb
app/models/speech.rb
app/models/speech_balloon.rb
app/views/balloons/_form.html.erb
app/views/ground_colors/_form.html.erb
app/views/ground_colors/new.html.erb
app/views/ground_pictures/_form.html.erb
app/views/ground_pictures/new.html.erb
app/views/panel_pictures/_form.html.erb
app/views/panel_pictures/new.html.erb
app/views/panels/_body.html.erb
app/views/panels/_form.html.erb
app/views/speech_balloons/_form.html.erb
app/views/speech_balloons/edit.html.erb
app/views/speech_balloons/new.html.erb
app/views/speeches/_form.html.erb
config/locales/pettanr.ja.yml