Merge branch 'development' into LTS_development

Browse source

# Conflicts:
#	lib/defines.h
#	src/controller/controller.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_streams.cpp
#	src/output/output_http.cpp

...

This commit is contained in:

Thulinma 2018-11-28 11:49:01 +01:00

parent 98e3940079 ac92e09262

commit 065f98e8e2

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