Saurabh 2e7a45dbb4 resolved merge conflicts

2018-04-24 11:16:13 +05:30

..

articles

…

data

Data export tool doc (#13419)

2018-04-03 10:43:08 +05:30

email

Doc imp (#13148)

2018-03-05 11:06:44 +05:30

feedback

resolved merge conflicts

2018-04-24 11:16:13 +05:30

integrations

Gocardless integration (#13008)

2018-03-01 10:59:21 +05:30

print

Doc imp (#13148)

2018-03-05 11:06:44 +05:30

settings

Doc imp (#13148)

2018-03-05 11:06:44 +05:30

setup-wizard

…

users-and-permissions

Doc imp (#13148)

2018-03-05 11:06:44 +05:30

__init__.py

…

authorization-rule.md

…

company-setup.md

…

index.md

…

index.txt

…

pos-setting.md

…

price-lists.md

…

setting-company-sales-goal.md

…

setting-up-taxes.md

Doc imp (#13148)

2018-03-05 11:06:44 +05:30

sms-setting.md

…

stock-reconciliation-for-non-serialized-item.md

…

territory.md

…

workflows.md

[minor] cache refactor and workflow docs (#13598)

2018-04-11 00:38:19 -08:00