Merge branch 'develop'

This commit is contained in:
Anand Doshi 2015-12-02 22:24:26 +05:30
commit b3131e647b
4 changed files with 4 additions and 4 deletions

View file

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = "6.12.1"
__version__ = "6.12.2"

View file

@ -357,7 +357,7 @@ def get_append_to(doctype=None, txt=None, searchfield=None, start=None, page_len
if not txt: txt = ""
return [[d] for d in frappe.get_hooks("email_append_to") if txt in d]
def pull(now=True):
def pull(now=False):
"""Will be called via scheduler, pull emails from all enabled Email accounts."""
import frappe.tasks
for email_account in frappe.get_list("Email Account", filters={"enable_incoming": 1}):

View file

@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
app_icon = "octicon octicon-circuit-board"
app_version = "6.12.1"
app_version = "6.12.2"
app_color = "orange"
source_link = "https://github.com/frappe/frappe"
app_license = "MIT"

View file

@ -1,6 +1,6 @@
from setuptools import setup, find_packages
version = "6.12.1"
version = "6.12.2"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()