diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-09-24 13:23:59 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2020-09-24 13:23:59 +0200 |
commit | 7a953e53a83b52916590da8ea29e438b6a767779 (patch) | |
tree | d87b17c1c1ad1c71265bf288c3330f039948ae1e /README.md | |
parent | 9a5a50a01c29825571dd044eccc00e888ac70459 (diff) | |
parent | 1339b47faf3d584acd0912f0c448ee030aa674ae (diff) |
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3
# Conflicts:
# README.md
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -75,7 +75,7 @@ development and community news: - Follow us on [Twitter] and [Facebook]. - Subscribe to the [Mixxx Development Blog][blog]. - Join the developer [mailing list]. -- Post on the [Mixxx forums][forums]. +- Post on the [Mixxx forums][discourse]. ## License @@ -109,3 +109,4 @@ license. [Mixxx glossary]: https://www.transifex.com/projects/p/mixxxdj/glossary/l/en/ [hardware compatibility]: https://mixxx.org/wiki/doku.php/hardware_compatibility [zulip]: https://mixxx.zulipchat.com/ +[discourse]: https://mixxx.discourse.group/ |