PyLink/VERSION at 584b7e371275abc75130d80f832d98fa643e6541 - PyLink - GitCom: Git with a cup of Com

GitHub/PyLink

mirror of https://github.com/jlu5/PyLink.git synced 2024-12-26 12:43:09 +01:00

James Lu 16ac91a718 Merge the long-awaited 2.0 branch into master

Merge branch 'devel'

Conflicts:
	RELNOTES.md
	VERSION
	classes.py
	conf.py
	coremods/control.py
	coremods/corecommands.py
	coremods/service_support.py
	docs/advanced-relay-config.md
	docs/faq.md
	example-conf.yml
	launcher.py
	plugins/global.py
	plugins/relay.py
	plugins/relay_clientbot.py
	protocols/p10.py
	utils.py

2018-07-11 22:45:52 -07:00

2 lines

8 B

Plaintext

Raw Blame History

2.0-rc0