tundebabzy df50a6f828 Merge pull request #12705 from achillesrasquinha/12704 ...

Fix for python 3 compatibility

2018-01-30 09:26:51 +01:00

..

accounts

Merge branch 'master' into develop

2018-01-29 18:53:54 +05:30

agriculture

…

assets

…

buying

resolved merge conflicts

2018-01-29 16:25:33 +05:30

change_log

…

commands

…

config

Minor - Healthcare Desktop UI (#12657)

2018-01-30 13:48:24 +05:30

controllers

resolved merge conflicts

2018-01-29 16:25:33 +05:30

crm

…

demo

…

docs

Addition of index.txt

2018-01-26 07:53:59 +00:00

domains

…

education

resolved merge conflicts

2018-01-29 16:25:33 +05:30

erpnext_integrations

…

healthcare

Patient Appointment - Check appointment day is holiday or physician on leave (#12556)

2018-01-23 17:23:27 +05:30

hr

Merge pull request #12587 from shreyashah115/leave-workflow

2018-01-24 15:04:17 +05:30

hub

…

hub_node

…

maintenance

…

manufacturing

…

non_profit

resolved merge conflicts

2018-01-24 11:24:10 +05:30

patches

Merge branch 'master' into develop

2018-01-29 17:42:37 +05:30

portal

…

projects

…

public

Merge branch 'master' into develop

2018-01-29 17:42:37 +05:30

regional

[Report] GSTR - 1 CDNR Report (#12554)

2018-01-26 11:27:22 +05:30

restaurant

…

selling

resolved merge conflicts

2018-01-29 16:25:33 +05:30

setup

Merge pull request #12705 from achillesrasquinha/12704

2018-01-30 09:26:51 +01:00

shopping_cart

…

startup

workflow patch fix

2018-01-24 18:50:01 +05:30

stock

Merge branch 'master' into develop

2018-01-29 18:53:54 +05:30

support

…

templates

…

tests

…

translations

…

utilities

resolved merge conflicts

2018-01-29 16:25:33 +05:30

__init__.py

bumped to version 10.0.17

2018-01-29 19:23:53 +06:00

exceptions.py

…

hooks.py

…

modules.txt

…

patches.txt

conflict fix

2018-01-29 17:07:57 +05:30