Victor Woeltjen f7839b758d Merge remote-tracking branch 'github/master' into open233b ... Resolve conflicts on nasa/openmctweb#233 Conflicts: platform/commonUI/general/bundle.json platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff platform/commonUI/general/res/sass/_main.scss platform/commonUI/general/res/sass/user-environ/_layout.scss platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/espresso/res/sass/_constants.scss platform/commonUI/themes/snow/res/css/theme-snow.css		2015-11-04 09:28:19 -08:00
..
containers	Merge remote-tracking branch 'nasa/open1404' into open1427	2015-07-15 13:45:37 -07:00
controls	Merging in latest github/master	2015-10-27 17:17:10 -07:00
menu	[Frontend] Significant re-factoring of CSS and markup	2015-09-02 18:02:58 -07:00
bottombar.html	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
indicator.html	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
label.html	[Frontend] type-icon evolving to universal t-item-icon	2015-10-28 00:24:57 -07:00
message-banner.html	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
object-inspector.html	[Frontend] Tweaks in Inspector	2015-10-30 18:31:02 -07:00
progress-bar.html	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
subtree.html	[Mobile] Collapse tree on click	2015-09-21 10:53:45 -07:00
tree-node.html	[Mobile] Collapse tree on click	2015-09-21 10:53:45 -07:00
tree.html	[Mobile] Collapse tree on click	2015-09-21 10:53:45 -07:00