inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 05:25:42 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into price-history

Browse Source
This commit is contained in:
Matthias
2021-04-18 11:58:46 +02:00
parent 3598c36043 724ecebb4c
commit 337f680c89
14 changed files with 154 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/InvenTree/settings.py
View File

@ -396,7 +396,6 @@ for key in db_keys:
env_var = os.environ.get(env_key, None)
if env_var:
logger.info(f"{env_key}={env_var}")
# Override configuration value
db_config[key] = env_var

2
InvenTree/InvenTree/version.py
View File

@ -8,7 +8,7 @@ import re
import common.models
INVENTREE_SW_VERSION = "0.2.1 pre"
INVENTREE_SW_VERSION = "0.2.2 pre"
# Increment this number whenever there is a significant change to the API that any clients need to know about
INVENTREE_API_VERSION = 2