Merge branch 'dev/1.2.x' into dev/1.3.x

This commit is contained in:
vexorian 2021-01-10 19:04:46 -04:00
commit c8109aaa71

View File

@ -6,10 +6,10 @@
* [ ] I have read the code of conduct.
* [ ] I am submitting to the correct base branch
* Bug fixes must go to `dev/1.0.x`.
* New features must go to `dev/1.1.x`.
<!--
* Bug fixes must go to `dev/1.2.x`.
* New features must go to `dev/1.3.x`.
-->
### Changes that modify the db structure
* [ ] Backwards compatibility: Users running the new code using an existing .disquetv folder will not lose their channels / settings.