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 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
[pettanr/pettanr.git]
/
app
/
assets
/
javascripts
/
admin.js
diff --git
a/app/assets/javascripts/admin.js
b/app/assets/javascripts/admin.js
index
a5c5d0c
..
c5cb978
100644
(file)
--- a/
app/assets/javascripts/admin.js
+++ b/
app/assets/javascripts/admin.js
@@
-4,4
+4,5
@@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
-//= require_directory ./manifest/work
+//= require_directory ./work
+//= require system