mbauskar 196f3b1fb8 resolved merge conflicts

2017-06-21 14:38:06 +05:30

..

repair_tools

…

v4_0

[minor] fix imports in old patches

2017-04-13 13:14:05 +05:30

v4_1

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

v4_2

[minor] fix imports in old patches

2017-04-13 13:14:05 +05:30

v4_4

…

v5_0

changed doctype name userrole to has role

2017-03-06 14:24:39 +05:30

v5_1

…

v5_2

…

v5_4

…

v5_7

…

v5_8

…

v6_0

…

v6_2

…

v6_3

…

v6_4

…

v6_5

…

v6_6

…

v6_8

…

v6_10

…

v6_12

…

v6_16

Fixed renamed fieldname

2016-12-09 15:09:11 +05:30

v6_19

…

v6_20

…

v6_20x

changed doctype name userrole to has role

2017-03-06 14:24:39 +05:30

v6_21

…

v6_23

…

v6_24

…

v6_27

…

v7_0

Warehouse Account Linking (#9292)

2017-06-15 11:09:27 +05:30

v7_1

Removed set_default_roles

2017-05-03 16:44:14 +05:30

v7_2

Check if doctype exists before renaming

2017-05-24 17:12:07 +05:30

v8_0

resolved merge conflicts

2017-06-21 14:38:06 +05:30

__init__.py

…