| commit | a896e52489c34c4118d4928cb802df5723adfcad | [log] [tgz] |
|---|---|---|
| author | mbauskar <mbauskar@gmail.com> | Tue Aug 29 20:41:59 2017 +0530 |
| committer | mbauskar <mbauskar@gmail.com> | Tue Aug 29 20:41:59 2017 +0530 |
| tree | 3175c3235dbc65ee67c3b0423a76b0f7a4985ee0 | |
| parent | b9939a6449ad70a155b527c7d03470a181e8d89f [diff] | |
| parent | fd6b371dacf8d9382f75fd82af6bffa567ff90a4 [diff] |
resolved merge conflicts
diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 48296e7..cf6ca02 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@ import frappe from erpnext.hooks import regional_overrides -__version__ = '8.9.2' +__version__ = '8.10.0' def get_default_company(user=None): '''Get default company for user'''