diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-13 16:07:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 16:07:40 +0100 |
| commit | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (patch) | |
| tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /app/views/layouts | |
| parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
| parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) | |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/admin.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 9fceb54eb..10fa42e8b 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -21,9 +21,9 @@ .content-heading %h2= yield :page_title - - if :page_heading_actions + - if :heading_actions .content-heading-actions - = yield :page_heading_actions + = yield :heading_actions = render 'application/flashes' |