Merge branch 'development' into LTS_development

Browse source

# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
#	src/output/output.h
#	src/output/output_hls.cpp
#	src/output/output_http.cpp

...

This commit is contained in:

Thulinma 2018-10-15 14:18:23 +02:00

parent cdaf7920b0 b2995ea2db

commit 8034578fad

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available