Merge branch 'master' into independent-login

2018-02-20 21:48:05 +02:00
parent ad11abb56e 6e1d497e66
commit 1cf0a6b150
33 changed files with 1576 additions and 813 deletions
@@ -17,12 +17,12 @@ setuptools.setup(

    install_requires=[
        "aiohttp>=2.3.10,<3",
-        "SQLAlchemy>=1.2.2,<2",
+        "SQLAlchemy>=1.2.3,<2",
        "alembic>=0.9.7",
        "Markdown>=2.6.11,<3",
        "ruamel.yaml>=0.15.35,<0.16",
        "Pillow>=5.0.0,<6",
-        "future-fstrings>=0.4.1",
+        "future-fstrings>=0.4.2",
        "python-magic>=0.4.15,<0.5",
    ],
    dependency_links=[