OSDN Git Service

merge:
authoryasushiito <yas@pen-chan.jp>
Mon, 6 Apr 2015 04:57:59 +0000 (13:57 +0900)
committeryasushiito <yas@pen-chan.jp>
Mon, 6 Apr 2015 04:57:59 +0000 (13:57 +0900)
commit083cd052b6a10be6ddb3534307176f8c415952a8
treefb21b01952bc57245d229ea089570928d6ca4b60
parent28197aecf803b9332afeebb4db14fb7042606f5e
parent29654349cc488148f053ec0bc973cd537cd6aaa8
merge:
15 files changed:
app/assets/javascripts/models/comic.js.coffee
app/assets/javascripts/models/comic_story.js.coffee
app/assets/javascripts/models/license.js.coffee
app/assets/javascripts/models/original_picture.js.coffee
app/assets/javascripts/models/panel.js.coffee
app/assets/javascripts/models/resource_picture.js.coffee
app/assets/javascripts/models/scroll.js.coffee
app/assets/javascripts/models/scroll_panel.js.coffee
app/assets/javascripts/models/sheet.js.coffee
app/assets/javascripts/models/sheet_panel.js.coffee
app/assets/javascripts/models/speech_balloon_template.js.coffee
app/assets/javascripts/models/story.js.coffee
app/assets/javascripts/models/story_sheet.js.coffee
app/assets/javascripts/models/system_picture.js.coffee
app/assets/javascripts/models/writing_format.js.coffee