Jeremy Stretch 71b674d11a Merge branch 'develop-2.6' into 54-power-modeling

2019-04-09 14:12:45 -04:00

..

circuits

Merge branch 'develop' into develop-2.6

2019-04-09 14:11:26 -04:00

dcim

Merge branch 'develop-2.6' into 54-power-modeling

2019-04-09 14:12:45 -04:00

extras

Merge branch 'develop-2.6' into 54-power-modeling

2019-04-09 14:12:45 -04:00

ipam

Merge branch 'develop' into develop-2.6

2019-04-09 14:11:26 -04:00

media/image-attachments

…

netbox

Merge branch 'develop-2.6' into 54-power-modeling

2019-04-09 14:12:45 -04:00

project-static

Fixes #3044: Ignore site/rack fields when connecting a new cable via device search

2019-04-04 16:19:20 -04:00

reports

…

secrets

Merge branch 'develop' into develop-2.6

2019-04-09 14:11:26 -04:00

templates

Fix rack elevation display

2019-04-02 13:50:57 -04:00

tenancy

Merge branch 'develop' into develop-2.6

2019-04-09 14:11:26 -04:00

users

Fixes #2880: Sanitize user password if an exception is raised during login

2019-02-13 11:34:16 -05:00

utilities

Merge branch 'develop' into develop-2.6

2019-04-02 13:12:34 -04:00

virtualization

Merge branch 'develop' into develop-2.6

2019-04-09 14:11:26 -04:00

generate_secret_key.py

…

manage.py

…