Jeremy Stretch 410cfab36b Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/ipam/forms.py

2017-04-27 15:29:40 -04:00

..

bootstrap-3.3.7-dist

Updated static CSS/JS libraries

2017-04-03 16:15:06 -04:00

css

Merge branch 'develop' into v2-develop

2017-04-13 15:42:50 -04:00

font-awesome-4.7.0

Updated static CSS/JS libraries

2017-04-03 16:15:06 -04:00

img

#672: Cleaned up rack elevation CSS

2016-12-05 18:11:07 -05:00

jquery-ui-1.12.1

Updated static CSS/JS libraries

2017-04-03 16:15:06 -04:00

js

Merge branch 'develop' into v2-develop

2017-04-27 15:29:40 -04:00