Skip to content
Snippets Groups Projects
Commit ae916874 authored by Simone Spinelli's avatar Simone Spinelli
Browse files

Merge branch 'feature/new_device_model_and_sites_and_orgs' into 'feature/test-provisioning-proxy' 

# Conflicts:
#   gso/workflows/device/create_device.py
parents 9875c289 b754fd1f
Branches
Tags
2 merge requests!12Add sites, and add integration of IPtrunks and routers with LSO deployment,!11Feature/test provisioning proxy
This commit is part of merge request !11. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 910 additions and 164 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment