Jeremy Stretch 68c099a2af Merge branch 'develop' into api2 ...

Conflicts:
	netbox/netbox/settings.py

2017-03-08 15:18:32 -05:00

..

circuits

Merge branch 'develop' into api2

2017-03-07 14:08:06 -05:00

dcim

Merged develop

2017-02-28 16:10:53 -05:00

inc

…

ipam

Merged develop

2017-02-28 16:10:53 -05:00

secrets

Adapted the web UI to work with the new secrets API

2017-02-03 16:14:42 -05:00

tenancy

…

users

Finished user control panel for tokens

2017-03-08 11:34:47 -05:00

utilities

…

_base.html

Closes #945: Display the current user in the nav menu

2017-03-07 22:27:46 -05:00

404.html

…

500.html

…

home.html

…

import_success.html

…

login.html

…

paginator.html

…

panel_table.html

…

table.html

…