Merge branch 'master' into mpegts-streamer

This commit is contained in:
0xboobface 2018-09-07 15:25:21 +02:00
commit 017a091d84
1 changed files with 0 additions and 5 deletions

View File

@ -144,11 +144,6 @@
<version>1.2.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<version>1.7.7.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>