]> git.tue.mpg.de Git - paraslash.git/commit
projects / paraslash.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1626125 39d6d4e)
Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 1 Dec 2024 16:10:27 +0000 (17:10 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 1 Dec 2024 16:10:27 +0000 (17:10 +0100)
commit775d555254b92055aedb062a372be9ff3421ebac
tree7291b240bb7878c4cdb4e16866fbd6a505677ec2tree | snapshot
parent16261259e791385eb1958bb2a28ecedc98c8f80acommit | diff
parent39d6d4e09db57572f374e42f653b2c8c03ec7a75commit | diff
Merge branch 'maint'

The merge conflicted in NEWS.md because both branches modified the
top of this file.

* maint:
  paraslash 0.6.5
NEWS.md diff1 | diff2 | blob | history
paraslash - network audio streaming tools