Jeremy Stretch e82e39745b Merge branch 'develop' into api2 ... Conflicts: netbox/dcim/api/serializers.py		2017-02-17 15:12:53 -05:00
..
bootstrap-3.3.6-dist	Pulled in all third-party resources and standardized on static template tag	2016-06-21 13:26:19 -04:00
css	Rack reservations (#900)	2017-02-16 13:46:58 -05:00
font-awesome-4.6.3	Pulled in all third-party resources and standardized on static template tag	2016-06-21 13:26:19 -04:00
img	#672: Cleaned up rack elevation CSS	2016-12-05 18:11:07 -05:00
jquery-ui-1.11.4	Pulled in all third-party resources and standardized on static template tag	2016-06-21 13:26:19 -04:00
js	Merge branch 'develop' into api2	2017-02-17 15:12:53 -05:00