Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pushed the most recent changes from the Parent Repo #2

Merged
merged 341 commits into from
Dec 7, 2018

Conversation

alexgalkin
Copy link

Updates from master (ant-media/Ant-Media-Server)

burak-58 and others added 30 commits September 15, 2018 10:07
Conflicts:
	pom.xml
	src/main/java/io/antmedia/datastore/db/InMemoryDataStore.java
Support external privkey.pem and fullchain.pem
mekya and others added 27 commits November 26, 2018 10:54
Previous source is not working anymore
Conflicts:
	src/main/java/io/antmedia/AntMediaApplicationAdapter.java
@alexgalkin alexgalkin merged commit 95ff37b into PrometheanTV:master Dec 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants