Media handling - correct branch #1105

Merged

annando merged 6 commits from media into develop 2021-04-27 20:59:56 +02:00

Conversation 0 Commits 6 Files changed 2 +91 -38

6 commits

Author	SHA1	Message	Date
Michael	a3ccc0b71d	Merge remote-tracking branch 'upstream/develop' into media	2021-04-27 18:37:21 +00:00
Michael	e945869e96	Comment change	2021-04-27 01:05:08 +00:00
Michael	286aa4770f	Improve comment	2021-04-26 21:11:33 +00:00
Michael	97f5910de7	Removed commented stuff	2021-04-26 14:12:53 +00:00
Michael	e8d30a5c69	Merge remote-tracking branch 'upstream/develop' into media	2021-04-26 13:03:05 +00:00
Michael	c9be3cfa7b	Improved media handling	2021-04-26 12:54:40 +00:00