openmct/platform/forms/res/templates/controls
Victor Woeltjen 67d1201214 Merge branch 'open-master' into open1272
Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js
2015-06-19 13:16:33 -07:00
..
button.html [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
checkbox.html [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
color.html [Fronted] Significant refactoring of mixins for containers and buttons 2015-06-12 10:00:51 -07:00
composite.html [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
datetime.html [Forms] Use MM-DD in date-time control 2015-06-15 13:01:43 -07:00
dialog.html [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
menu-button.html [Fronted] Significant refactoring of mixins for containers and buttons 2015-06-12 10:00:51 -07:00
select.html [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
textfield.html [Licenses] Add license headers 2015-05-13 16:43:30 -07:00