diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 16:06:38 -0700 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 16:06:38 -0700 |
commit | 19260b63080435af8362de3a98e10769f6c5267c (patch) | |
tree | 980d33c1b2b6195cab12977a22b5b1bbb1e19005 /doc/ADMIN.md | |
parent | 12ed72c5ee9597cf771e22af5c090e48e7c0a1e5 (diff) | |
parent | f8ee42cf1e01d3f89ff8ee324ea423b6239ca2a3 (diff) |
Merge branch 'release/0.8' into develop
Conflicts:
locale/he_IL/app.po
locale/id/app.po
Diffstat (limited to 'doc/ADMIN.md')
-rw-r--r-- | doc/ADMIN.md | 4 |
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 |