mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
Code

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins 2017-10-26 15:08:34 +00:00
commit 656f5b6f87
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/custom_emojis_controller.rb
View File

@ -36,7 +36,7 @@ module Admin
flash[:alert] = I18n.t('admin.custom_emojis.copy_failed_msg') flash[:alert] = I18n.t('admin.custom_emojis.copy_failed_msg')
end end
redirect_to admin_custom_emojis_path(params[:page]) redirect_to admin_custom_emojis_path(page: params[:page])
end end
def enable def enable