Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Dec 20, 2018
Merged

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

merged 2 commits into from
Dec 20, 2018

Conversation

CyaLiven
Copy link

{{'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
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
BennieMeng
BennieMeng approved these changes Dec 19, 2018
View reviewed changes
Copy link
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
Reviewers

@BennieMeng BennieMeng BennieMeng approved these changes

Assignees

@CyaLiven CyaLiven

@wilhelmguo wilhelmguo

Labels
kind/bug Categorizes issue or PR as related to a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@CyaLiven @wilhelmguo @BennieMeng