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

merge in epics-motor R7-3 to our master #59

Merged
merged 16 commits into from
Jun 2, 2023
Merged

merge in epics-motor R7-3 to our master #59

merged 16 commits into from
Jun 2, 2023

Conversation

rerpha
Copy link
Contributor

@rerpha rerpha commented May 24, 2023

No description provided.

@rerpha rerpha mentioned this pull request May 25, 2023
Closed
2 tasks
@FreddieAkeroyd FreddieAkeroyd self-requested a review June 2, 2023 22:52
FreddieAkeroyd
FreddieAkeroyd approved these changes Jun 2, 2023
View reviewed changes
Copy link
Member

@FreddieAkeroyd FreddieAkeroyd left a comment

Choose a reason for hiding this comment

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

Looks good - have adjusted some settings for new RSTM restore mode and removed files that were deleted upstream during modules rearrangement.

@FreddieAkeroyd FreddieAkeroyd merged commit ddcc4e9 into master Jun 2, 2023
@FreddieAkeroyd FreddieAkeroyd deleted the merge_r7_3_to_master branch June 2, 2023 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FreddieAkeroyd FreddieAkeroyd FreddieAkeroyd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rerpha @FreddieAkeroyd