master
Rename `salt.renderers.toml` to `salt.renderers.tomlmod`.
Normalize CRLF in test_issue_30690 content comparison
Update code to be Py3.7+ to reduce merge forward conflicts
Rename `salt/serializers/toml.py` to `salt/serializers/tomlmod.py`