Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 02dc8f0..8651531 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -585,5 +585,6 @@
erpnext.patches.v12_0.change_qms_icon
erpnext.patches.v12_0.rename_learn_to_help
erpnext.patches.v12_0.rename_accounts_desktop_icon_to_accounting
-erpnext.patches.v12_0.replace_project_list_desktop_icon_with_projects_module_desktop_icon
+erpnext.patches.v12_0.replace_project_list_desktop_icon_with_projects_module_desktop_icon # 09-01-2019
+erpnext.patches.v11_0.rename_additional_salary_component_additional_salary
erpnext.patches.v12_0.move_item_tax_to_item_tax_template