Jeremy Stretch eddb8a2fbc Merge branch 'develop' into api2 ... Conflicts: netbox/dcim/api/serializers.py netbox/dcim/api/views.py netbox/dcim/filters.py		2017-02-27 17:04:08 -05:00
..
api	Re-implemented CustomFieldSerializer (read-only for now)	2017-02-09 16:55:54 -05:00
fixtures	Closes #176: Added initial_data fixtures for new installs	2016-08-01 12:29:26 -04:00
migrations	Closes #783: Add a description field to the Circuit model	2017-01-17 15:18:03 -05:00
__init__.py	Fixes #817: Update last_updated time of a circuit when editing a child termination	2017-01-23 15:31:41 -05:00
admin.py	Closes #49: Introduction of circuit terminations	2016-12-14 13:47:22 -05:00
apps.py	Fixes #817: Update last_updated time of a circuit when editing a child termination	2017-01-23 15:31:41 -05:00
filters.py	Removed circuit-specific endpoint for CircuitTerminations	2017-02-01 15:01:56 -05:00
forms.py	Closes #105: Interface groups (#919)	2017-02-27 16:52:13 -05:00
models.py	Basic Support for Python 3 (#827)	2017-01-23 16:44:29 -05:00
signals.py	Fixes #817: Update last_updated time of a circuit when editing a child termination	2017-01-23 15:31:41 -05:00
tables.py	Closes #783: Add a description field to the Circuit model	2017-01-17 15:18:03 -05:00
urls.py	Closes #49: Introduction of circuit terminations	2016-12-14 13:47:22 -05:00
views.py	Closes #898: Expand circuits list in provider view	2017-02-16 15:13:35 -05:00