OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dbe1cc6
2a44a0f
)
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
author
yasushiito
<yas@pen-chan.jp>
Mon, 20 Jul 2015 06:04:07 +0000
(15:04 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Mon, 20 Jul 2015 06:04:07 +0000
(15:04 +0900)
1
2
app/assets/javascripts/yasapp.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/assets/javascripts/yasapp.js
index
66d9c27
,
8360f56
..
12877aa
---
1
/
app/assets/javascripts/yasapp.js
---
2
/
app/assets/javascripts/yasapp.js
+++ b/
app/assets/javascripts/yasapp.js
@@@
-307,12
-307,8
+307,11
@@@
//= require_directory ./models
//= require_directory ./view
//= require_directory ./view/button
- //= require_directory ./view/image
//= require_directory ./view/show
+//= require_directory ./view/show/header
+//= require_directory ./view/show/footer
//= require_directory ./view/play
+//= require_directory ./view/summary
//= require_directory ./views
//= require_directory ./views/folders
//= require_directory ./views/artists