Merge branch 'master' into limit-actions

gpodder · Aug 15, 2018 · e0d8967 · e0d8967
2 parents f334e3c + 52fbfe7
commit e0d8967
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 
 python:
- - "3.5"
  - "3.6"
  - "3.6-dev"
  - "3.7-dev"

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django==2.0.7
+Django==2.0.8
 Babel==2.6.0
 Pillow==5.2.0
 celery[redis]==4.2.1
@@ -10,7 +10,7 @@ gunicorn==19.9.0
 html2text==2018.1.9
 markdown2==2.3.5
 oauth2client==4.1.2
-psycopg2cffi==2.7.7
+psycopg2cffi==2.8.1
 python-dateutil==2.7.3
 redis==2.10.6
 django-celery-results==1.0.1

diff --git a/static/clientconfig.json b/static/clientconfig.json
@@ -1,6 +1,6 @@
 {
     "mygpo":  {
-        "baseurl": "http://gpodder.net/"
+        "baseurl": "https://gpodder.net/"
     },
 
     "mygpo-feedservice": {