Skip to content

fix admin portal. i18n:{{'BUTTON.EDIT' |translate}]#163

Merged
wilhelmguo merged 2 commits intoQihoo360:masterfrom
CyaLiven:fix-admin-edit-translate
Dec 20, 2018
Merged

fix admin portal. i18n:{{'BUTTON.EDIT' |translate}]#163
wilhelmguo merged 2 commits intoQihoo360:masterfrom
CyaLiven:fix-admin-edit-translate

Conversation

@CyaLiven
Copy link
Copy Markdown

{{'BUTTON.EDIT' |translate}] --> {{'BUTTON.EDIT' |translate}}"

What type of PR is this?

Uncomment only one, leave it on its own line:

/kind bug

@wilhelmguo
Copy link
Copy Markdown
Collaborator

@CyaLiven Thanks for your PR. Please resolve the conflicts.

@wilhelmguo wilhelmguo added the kind/bug Categorizes issue or PR as related to a bug. label Dec 19, 2018
Copy link
Copy Markdown
Collaborator

@BennieMeng BennieMeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@BennieMeng BennieMeng assigned wilhelmguo and CyaLiven and unassigned CyaLiven Dec 19, 2018
@wilhelmguo wilhelmguo merged commit 380c4d2 into Qihoo360:master Dec 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug Categorizes issue or PR as related to a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants