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.

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

Update admin.css #4639

Closed
wants to merge 1 commit into from
Closed

Update admin.css #4639

wants to merge 1 commit into from

Conversation

meis2m
Copy link

@meis2m meis2m commented Jan 13, 2017

Checklist:

  • Correct branch: master for new features; 3.2.x, 3.1.x for fixes
  • Tests pass
  • Code follows coding guidelines: master / 3.2.x, 3.1.x
  • Commit follows commit message format

Tracker ticket (set the ticket ID to your ticket ID):

https://tracker.phpbb.com/browse/PHPBB3-12345

Copy link
Member

@Crizz0 Crizz0 left a comment

Choose a reason for hiding this comment

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

Please make sure, that your commit follows the commit message format: https://area51.phpbb.com/docs/dev/32x/development/git.html#commit-messages

Change your branch to 3.2.x, if you want to fix a bug in 3.2.x Rhea (actual target phpbb:master).

@meis2m meis2m changed the base branch from master to 3.2.x January 14, 2017 22:16
@Nicofuma Nicofuma added this to the 3.2.1 milestone Jan 15, 2017
@marc1706 marc1706 changed the base branch from 3.2.x to master January 17, 2017 09:31
@marc1706
Copy link
Member

Your local branch is based on master as you might have seen after changing the target branch to 3.2.x. You should rebase your changes on top of 3.2.x:
git rebase upstream/3.2.x
Afterwards force push your changes to your pull request branch.

@vinny
Copy link
Member

vinny commented Feb 1, 2017

#4682

@Nicofuma Nicofuma closed this Feb 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants