diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-30 18:24:38 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-30 18:24:38 -0600 |
commit | d817c0a958efda990af654f72d15d6f42b43dd49 (patch) | |
tree | 0cff3632163fadeba3585f56ecdd8d1d919e12c7 /app/views/admin/custom_emojis/index.html.haml | |
parent | 65c87ca0ae20eb5dc62751047bda3e8b11e37ce0 (diff) | |
parent | 4cca1d1e7efce51eecb64489f412a7b8631f0aed (diff) |
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Diffstat (limited to 'app/views/admin/custom_emojis/index.html.haml')
-rw-r--r-- | app/views/admin/custom_emojis/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml index 89ea3a6fe..3a119276c 100644 --- a/app/views/admin/custom_emojis/index.html.haml +++ b/app/views/admin/custom_emojis/index.html.haml @@ -29,7 +29,7 @@ .actions %button= t('admin.accounts.search') - = link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative' + = link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button negative' .table-wrapper %table.table |