Resolve merge conflict

This commit is contained in:
fkantelberg
2020-01-12 21:19:05 +01:00
126 changed files with 1261 additions and 94 deletions

View File

@@ -1,4 +1,4 @@
sqlalchemy
mysqlclient
pymssql
radicale
pymssql<3.0