OSDN Git Service

merge v06sheet
authoryasushiito <yas@pen-chan.jp>
Fri, 25 Oct 2013 09:49:21 +0000 (18:49 +0900)
committeryasushiito <yas@pen-chan.jp>
Fri, 25 Oct 2013 09:49:21 +0000 (18:49 +0900)
commit6f2a183413df55de274cf896a0b54fceb6be00bf
tree2e4f7b4b86edb7b7b24da654893bb59968135e13
parent4113abdecb6e8b5df5a1a1448741c10e20e66620
parent58e1a7ee64efd9c56db0f6e543fa24ed65b32f3f
merge v06sheet
16 files changed:
app/assets/javascripts/application.js
app/assets/stylesheets/test.css.scss
app/helpers/application_helper.rb
app/models/panel.rb
app/views/comics/_form.html.erb
app/views/home/index.html.erb
app/views/scroll_panels/_form.html.erb
app/views/scroll_panels/edit.html.erb
app/views/scrolls/_form.html.erb
app/views/sheet_panels/_form.html.erb
app/views/sheets/_form.html.erb
app/views/stories/_form.html.erb
app/views/story_sheets/_form.html.erb
app/views/story_sheets/edit.html.erb
db/migrate/20130911043458_copy_to_scroll.rb
spec/models/panel_spec.rb