Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.1' into 2.2
Browse files Browse the repository at this point in the history 
Conflicts:
	res/translations/mixxx.ts
  • Loading branch information
@daschuer
daschuer committed Dec 24, 2018
2 parents 0e685c1 + 7f1d149 commit d9d7ea6
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit d9d7ea6

Please sign in to comment.