Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git · mixxxdj/mixxx@50b40ab · GitHub

Commit

Merge branch '2.3' of [email protected]:mixxxdj/mixxx.git

Browse files

# Conflicts:
#	src/sources/soundsourceopus.cpp

Loading branch information

uklotzde committed Aug 29, 2021

2 parents 5c917f1 + b093668 commit 50b40ab