diff options
| author | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
| commit | e1a004e2b24c2c235452469abfefa033e24435b2 (patch) | |
| tree | a4b1c89a5aa4d5ccb3c17521499c999dedd5842d /app | |
| parent | 4793c2b770fcb018303b7ab226b75cc218364327 (diff) | |
| parent | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff) | |
Merge branch 'master' into help_develop
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/application.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index b0644f2..bd03477 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -18,7 +18,7 @@ .content .row .span12 - = render 'layouts/messages' # TODO: In firefox, these are hidden by header + = render 'layouts/messages' %div{"data-pjax-container" => ""} - = yield + = yield %footer |