Nabin Hait 391eca18c7 Fixed merge conflict

2017-02-20 19:38:22 +05:30

..

accounts

Merge pull request #7751 from nick9822/patch-3

2017-02-20 19:11:31 +05:30

buying

Added fields in global search

2017-02-20 13:38:31 +05:30

change_log

…

config

Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana

2017-02-20 17:25:01 +05:30

controllers

Merge branch 'develop' into develop

2017-02-20 19:09:20 +05:30

crm

Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30

demo

[fix] for setup wizard tests and demo;

2017-02-09 18:06:11 +05:30

docs

Merge pull request #7587 from noussh/develop

2017-02-20 19:33:55 +05:30

hr

Fixed merge conflict

2017-02-20 19:01:04 +05:30

hub_node

…

maintenance

Added fields in global search

2017-02-20 13:38:31 +05:30

manufacturing

Fixed merge conflict

2017-02-20 19:38:22 +05:30

patches

Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30

portal

…

projects

Added fields in global search

2017-02-20 13:38:31 +05:30

public

Fixed merge conflict

2017-02-20 19:38:22 +05:30

schools

Added fields in global search

2017-02-20 13:38:31 +05:30

selling

Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30

setup

Fixed merge conflict

2017-02-20 19:01:04 +05:30

shopping_cart

…

startup

…

stock

Merge branch 'develop' into develop

2017-02-20 19:09:20 +05:30

support

Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30

templates

Fixed merge conflict

2017-02-20 19:38:22 +05:30

tests

…

translations

…

utilities

Merge branch 'master' into develop

2017-02-16 15:59:59 +05:30

__init__.py

Fixed merge conflict

2017-02-20 15:00:04 +05:30

exceptions.py

…

hooks.py

Fixed merge conflict

2017-02-20 19:38:22 +05:30

modules.txt

…

patches.txt

Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30