Merge branch 'master' into staging-fixes

2018-11-15 11:17:59 +00:00 · 2018-11-15 11:17:59 +00:00 · 8bc1f37c49
commit 8bc1f37c49
parent e900deb046 e04cd475f6
2 changed files with 2 additions and 2 deletions
--- a/frappe/init.py
+++ b/frappe/init.py
@ -17,7 +17,7 @@ from faker import Faker
 from .exceptions import *
 from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)

-__version__ = '10.1.61'
+__version__ = '10.1.62'
 __title__ = "Frappe Framework"

 local = Local()
--- a/requirements.txt
+++ b/requirements.txt
@ -13,7 +13,7 @@ werkzeug
 semantic_version
 rauth>=0.6.2
 requests
-redis
+redis==2.10.6
 selenium
 babel
 ipython