develop #6

Merged

milan merged 3 commits from develop into master

2020-11-04 17:40:52 +01:00

Author	SHA1	Message	Date
root	a67ba9a7ec	update	2020-11-04 17:37:44 +01:00
Milan Meduna	a9be457b99	Merge pull request 'two_new_mods' (#4 ) from master into develop Reviewed-on: #4	2020-10-30 10:20:37 +01:00
Milan Meduna	f03b1c4f2d	Merge pull request 'master' (#3 ) from master into develop Reviewed-on: #3	2020-10-29 20:25:39 +01:00