Merge branch 'develop' into new-subscription

This commit is contained in:
tundebabzy
2018-03-02 11:10:27 +01:00
205 changed files with 60808 additions and 47889 deletions

View File

@@ -11,7 +11,7 @@ app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
develop_version = '10.x.x-develop'
develop_version = '11.x.x-develop'
error_report_email = "support@erpnext.com"