Merge branch 'global-vlan' of https://github.com/Shawn0720/netbox into global-vlan

Browse Source

# Conflicts:
#       netbox/ipam/forms.py
#       netbox/ipam/models.py
#       netbox/project-static/js/forms.js
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#       .git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch global-vlan
# Your branch and 'origin/global-vlan' have diverged,
# and have 68 and 2 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Untracked files:
#       commit.msg
#       env/
#

...

This commit is contained in:

Shawn Peng 2017-02-18 18:37:33 -08:00

parent cebbc65f4c 465477057b

commit 6c89fc5eec

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available