Victor Woeltjen 9435e75461 Merge remote-tracking branch 'slhale/open33' into open47b ... Fix merge conflict in preparation to integrate nasa/openmctweb#47 Conflicts: platform/commonUI/browse/res/templates/browse/object-header.html		2015-07-24 13:46:37 -07:00
..
browse	Merge remote-tracking branch 'slhale/open33' into open47b	2015-07-24 13:46:37 -07:00
create	[Frontend] New symbols font and CSS adjustments	2015-06-24 11:42:29 -07:00
items	[Frontend] New symbols font and CSS adjustments, in-progress	2015-06-23 16:07:29 -07:00
browse-object.html	[Addressability] Obey view query string param	2015-06-16 14:58:03 -07:00
browse.html	[Frontend] Edit mode refactored to use new mct-split-pane	2015-06-30 13:23:56 -07:00
menu-arrow.html	[Browse] Splitting up Menu Gesture	2015-06-30 16:17:00 -07:00
topbar-browse.html	[Licenses] Add license headers	2015-05-13 16:43:30 -07:00