Andrew DeMaria 143a220719 Merge remote-tracking branch 'airsonic/pr/849' ...

Conflicts:
	airsonic-main/cve-suppressed.xml
	airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java
	airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java
	pom.xml

2019-03-16 19:27:53 -04:00

..

src

Merge remote-tracking branch 'airsonic/pr/849'

2019-03-16 19:27:53 -04:00

cve-suppressed.xml

#1 CVE-2018-1000840

2019-02-16 10:38:47 -07:00

pom.xml

Merge remote-tracking branch 'airsonic/pr/849'

2019-03-16 19:27:53 -04:00