Merge branch 'staging' into develop

frappe/hooks.py

@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '11.x.x-develop'
-staging_version = '11.0.1'
+staging_version = '11.0.2'
 
 app_email = "info@frappe.io"
 

frappe/patches/v10_0/refactor_social_login_keys.py

@@ -111,7 +111,7 @@ def insert_user_social_login(user, modified_by, provider, idx, userid=None, user
 		VALUES ({values})
 	""".format(
 		source_cols = "`" + "`, `".join(source_cols) + "`",
-		values= "'" + "', '".join(values) + "'"
+		values= "'" + "', '".join([frappe.db.escape(d) for d in values]) + "'"
 	)
 
 	frappe.db.sql(query)

requirements.txt

@@ -22,7 +22,7 @@ email_reply_parser
 click
 num2words==0.5.5
 watchdog==0.8.0
-bleach
+bleach==2.1.4
 bleach-whitelist
 Pillow
 beautifulsoup4