Jeremy Stretch f31d6c55be Fix erroneous merge conflict resolution from v2.5.11

2019-04-29 14:57:28 -04:00

..

circuits

Cleanup from earlier work on caching

2019-04-22 14:49:31 -04:00

dcim

Merge v2.5.11

2019-04-29 14:40:18 -04:00

extras

Fix erroneous merge conflict resolution from v2.5.11

2019-04-29 14:57:28 -04:00

ipam

Fix regex for IPAddress.dns_name (but see #3106)

2019-04-25 14:49:52 -04:00

media/image-attachments

…

netbox

Post-release version bump

2019-04-29 14:27:22 -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

Cleanup from earlier work on caching

2019-04-22 14:49:31 -04:00

templates

Merge v2.5.11

2019-04-29 14:40:18 -04:00

tenancy

Cleanup from earlier work on caching

2019-04-22 14:49:31 -04:00

users

Merge v2.5.11

2019-04-29 14:40:18 -04:00

utilities

Cleanup from earlier work on caching

2019-04-22 14:49:31 -04:00

virtualization

Cleanup from earlier work on caching

2019-04-22 14:49:31 -04:00

generate_secret_key.py

…

manage.py

…