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 routes and user controllers conflicting #7212

Merged
merged 1 commit into from Jul 27, 2020
Merged

Fix admin routes and user controllers conflicting #7212

merged 1 commit into from Jul 27, 2020

Conversation

alexandrebodin
Copy link
Member

Description of what you did:

Fix #7196

@alexandrebodin
Fix admin routes and user controllers conflicting
0369d5f 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
@alexandrebodin alexandrebodin added this to the 3.1.2 milestone Jul 27, 2020
@alexandrebodin alexandrebodin added source: core:strapi Source is core/strapi package issue: bug Issue reporting a bug labels Jul 27, 2020
petersg83
petersg83 approved these changes Jul 27, 2020
View reviewed changes
Copy link
Contributor

@petersg83 petersg83 left a comment

Choose a reason for hiding this comment

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

LGTM!

@alexandrebodin alexandrebodin merged commit c4472f6 into master Jul 27, 2020
@alexandrebodin alexandrebodin deleted the fix/issue-7196 branch July 27, 2020 17:47
This was referenced Jun 6, 2021
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petersg83 petersg83 petersg83 approved these changes

Assignees
No one assigned
Labels
issue: bug Issue reporting a bug source: core:strapi Source is core/strapi package
Projects
None yet
Milestone
3.1.2
2 participants
@alexandrebodin @petersg83