Nabin Hait e01dcc170c Merge branch 'master' into develop

2018-03-13 17:11:52 +05:30

..

accounts

Fixed merge conflict

2018-03-13 16:15:41 +05:30

agriculture

Fixed merge conflict

2018-03-12 15:49:59 +05:30

assets

…

buying

Fixed merge conflict

2018-03-13 16:15:41 +05:30

change_log

…

commands

…

config

…

controllers

Fixed merge conflict

2018-03-13 16:15:41 +05:30

crm

Add Ends-On field in the Lead doctype (#13147)

2018-03-12 18:49:54 +05:30

demo

…

docs

payment terms video tutorial in videos/learn (#13258)

2018-03-12 13:07:21 +05:30

domains

…

education

…

erpnext_integrations

…

healthcare

Physician Schedule fixes (#13284)

2018-03-13 14:50:24 +05:30

hotels

…

hr

[charts] update charts API

2018-03-12 09:54:56 +05:30

hub

…

hub_node

…

maintenance

…

manufacturing

string_types from basestirng

2018-03-12 19:15:29 +05:30

non_profit

…

patches

Merge branch 'master' into develop

2018-03-13 17:11:52 +05:30

portal

…

projects

…

public

…

regional

…

restaurant

…

selling

Fixed merge conflict

2018-03-13 16:15:41 +05:30

setup

…

shopping_cart

…

startup

…

stock

Fixed merge conflict

2018-03-13 16:15:41 +05:30

support

[charts] update charts API

2018-03-12 09:54:56 +05:30

templates

…

tests

…

translations

…

utilities

Add Ends-On field in the Lead doctype (#13147)

2018-03-12 18:49:54 +05:30

__init__.py

bumped to version 10.1.10

2018-03-13 17:41:49 +06:00

exceptions.py

…

hooks.py

…

modules.txt

…

patches.txt

Reserve for subcontracting (#13195)

2018-03-12 14:12:12 +05:30