Nabin Hait 1b9caf90dd Merge branch 'master' into develop

2016-12-08 12:33:54 +05:30

..

accounts

Merge branch 'master' into develop

2016-12-08 12:33:54 +05:30

buying

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

change_log

Change Logs for v7.1

2016-10-26 16:28:54 +05:30

config

[minor] update font awesome icons

2016-12-07 11:09:02 +05:30

controllers

Merge pull request #7023 from frappe/revert-7012-remove-count-star

2016-11-24 13:26:38 +05:30

crm

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

demo

Fixes for demo

2016-11-01 17:05:53 +05:30

docs

Fixes erpnext issue 6891 (#7128)

2016-12-07 12:14:51 +05:30

fleet_management

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

hr

Fixed merge conflict

2016-12-06 16:16:58 +05:30

hub_node

…

maintenance

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

manufacturing

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

patches

Fixed merge conflict

2016-12-06 16:16:58 +05:30

portal

Fixed view button functionality in homepage

2016-09-28 14:08:47 +05:30

projects

Merge branch 'master' into develop

2016-12-08 12:33:54 +05:30

public

Fixed merge conflict

2016-12-06 16:16:58 +05:30

schools

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

selling

Fixed merge conflict

2016-12-06 16:16:58 +05:30

setup

Fixed merge conflict

2016-12-06 16:16:58 +05:30

shopping_cart

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

startup

Revert "[optimize] remove count(*) from queries"

2016-11-21 21:04:47 +05:30

stock

Fixed merge conflict

2016-12-06 16:16:58 +05:30

support

[minor] Add button to add help article from Issue #7132 (#7154)

2016-12-07 14:41:23 +05:30

templates

[minor] font-awesome fixes

2016-12-05 15:02:24 +05:30

tests

[minor] setting up website optional in setup wizard

2016-08-09 16:44:37 +05:30

translations

Merge branch 'master' into develop

2016-11-17 16:41:52 +05:30

utilities

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

__init__.py

bumped to version 7.1.22

2016-12-08 13:03:53 +06:00

exceptions.py

…

hooks.py

[minor] update font awesome icons

2016-12-07 11:09:02 +05:30

modules.txt

Fixes 6171 (#6417)

2016-10-17 17:02:12 +05:30

patches.txt

Fixed merge conflict

2016-12-06 16:16:58 +05:30