aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ADMIN.md
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-03-19 18:56:20 -0700
committerLouise Crow <louise.crow@gmail.com>2013-03-19 18:56:20 -0700
commit56127c664a4f51e18728ed08bdf00064efee89c2 (patch)
treecd04bdcc929ea4232d44d02f51192f6459928769 /doc/ADMIN.md
parentf7878a229b597b5fc7ba8172c8e8c94a8fd9d7b6 (diff)
parentdc71db3f98c64fb93ac7d74b8a424f7849a33786 (diff)
Merge branch 'develop' into rails-3-develop
Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb
Diffstat (limited to 'doc/ADMIN.md')
-rw-r--r--doc/ADMIN.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 059010e68..07fe9398d 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -16,6 +16,6 @@ The javascript is included in a funky way
To change it, edit the coffeescript at
`lib/view/general/admin.coffee`, and then do something like:
- $ coffee -o /tmp/ -c lib/views/general/admin.coffee
- $ mv /tmp/admin.js lib/views/general/admin_js.erb
+ $ coffee -o /tmp/ -c app/views/admin_general/admin.coffee
+ $ mv /tmp/admin.js app/views/admin_general/admin_js.erb