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/admin/custom_emojis | |
| parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
| parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) | |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/custom_emojis')
| -rw-r--r-- | app/views/admin/custom_emojis/index.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml index 4fbadee90..dc9ebf507 100644 --- a/app/views/admin/custom_emojis/index.html.haml +++ b/app/views/admin/custom_emojis/index.html.haml @@ -1,6 +1,9 @@ - content_for :page_title do = t('admin.custom_emojis.title') +- content_for :heading_actions do + = link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button' + .filters .filter-subset %strong= t('admin.accounts.location.title') @@ -78,6 +81,3 @@ = paginate @custom_emojis -%hr.spacer/ - -= link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button' |