diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-28 20:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-28 20:36:55 +0100 |
| commit | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (patch) | |
| tree | 770029d865518400da31e9cdb55fc9c584e5a90b /app/views/layouts | |
| parent | ee1f1a2ec97604ed364a5944bd300be0771ba7d7 (diff) | |
| parent | b00f60f1d3d5415b5fd536191a7ee183ae910d03 (diff) | |
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/admin.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 66382db50..0e52702dc 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -14,4 +14,4 @@ = yield -= render template: 'layouts/application', locals: { body_classes: 'admin' } += render template: 'layouts/application' |