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

Fixed #3443. Added and fixed mixer automation labels. #3453

Merged
merged 1 commit into from Mar 26, 2017

Conversation

@karmux
Copy link
Contributor

karmux commented Mar 24, 2017

No description provided.

@Umcaruje Umcaruje changed the base branch from master to stable-1.2 Mar 26, 2017
@Umcaruje
Copy link
Member

Umcaruje commented Mar 26, 2017

Changed the PR to address stable-1.2

Copy link
Member

Umcaruje left a comment

This fixes the issue and works nice 👍

One thing is that I would have spaces around all these brackets, but that should be handled in a separate PR, as this is consistent with the codebase rn.

Merging.

@Umcaruje Umcaruje merged commit 4dc5d14 into LMMS:stable-1.2 Mar 26, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jasp00
Copy link
Member

jasp00 commented Mar 28, 2017

Changed the PR to address stable-1.2

How does work flow? Another PR to master?

@Umcaruje
Copy link
Member

Umcaruje commented Mar 28, 2017

The way this happened for 1.1 is that we had people just periodically merge the new changes in the stable branch back to master.

@tresf
Copy link
Member

tresf commented Mar 28, 2017

How does work flow? Another PR to master?

No, the admins generally handle this by doing occasional (e.g. weekly) syncs between stable-1.2 and master.

@karmux karmux deleted the karmux:3443_mixer_automation_labels branch Mar 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.