OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v03_test' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v03_test
[pettanr/pettanr.git]
/
app
/
models
/
comic.rb
diff --git
a/app/models/comic.rb
b/app/models/comic.rb
index
3dc6bae
..
6db937d
100644
(file)
--- a/
app/models/comic.rb
+++ b/
app/models/comic.rb
@@
-113,9
+113,9
@@
class Comic < ActiveRecord::Base
:author,
:panels => [
:panel_pictures => :resource_picture,
- :balloons => :spe
a
ches
+ :balloons => :spe
e
ches
]
- ], order: 'panels.t, spe
a
ches.t')
+ ], order: 'panels.t, spe
e
ches.t')
end
def to_json_play