diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
| commit | 8b4003f7fce9e089f2220e6f1a21681f7cf2df3d (patch) | |
| tree | 15333943091fc3ae79dedee46a6dd34ce3f1a1ec /app/views/admin_general/debug.rhtml | |
| parent | 646fffde374e575ab53cfae78e7a0c521cd90d6f (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/views/admin_general/debug.rhtml')
| -rw-r--r-- | app/views/admin_general/debug.rhtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin_general/debug.rhtml b/app/views/admin_general/debug.rhtml index d7bf1c6da..99488ba0c 100644 --- a/app/views/admin_general/debug.rhtml +++ b/app/views/admin_general/debug.rhtml @@ -2,7 +2,7 @@ <h1><%=@title%></h1> -<p>You are <%= h @http_auth_user %></p> +<p>You are <%= h @admin_current_user %></p> <h2>Version numbers</h2> |