mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into v2-develop

Browse Source 
Conflicts:
	netbox/netbox/settings.py
This commit is contained in:
Jeremy Stretch
2017-03-23 17:14:41 -04:00
parent 93a4327921 a51f5edbc8
commit 576e21eb65
6 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/netbox/settings.py
View File

@ -13,7 +13,7 @@ except ImportError:
)
VERSION = '2.0-beta1'
VERSION = '2.0.0-dev'
# Import local configuration
ALLOWED_HOSTS = DATABASE = SECRET_KEY = None