Skip to content

Update zoom_merge with master updates (after wrangling immense conflicts)

William Roper requested to merge master_zoom_merge_conflict_fix into zoom_merge

Updating the zoom branch... after painfully going through a ton of conflicts!

Merge request reports