slaclab / pysmurf

Other
2 stars 9 forks source link

Merge main into develop #672

Closed jlashner closed 2 years ago

jlashner commented 2 years ago

Description

This PR merges recent commits from main into the develop branch. We discussed a while ago making sure active development happens on the develop branch so that main stays relatively stable, and we can go back to it to add hot-fixes without needing to wait until all dev features have been fully tested. Looks like we diverged from that, so with this PR I'm just trying to bring us back to that state.

Does this PR break any interface?