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
..
browse	[Frontend] Manual re-do of collapse/expand panes	2015-10-22 13:34:16 -07:00
create	[Frontend] Fixed erroneous classes wrapping Create button;	2015-10-29 11:21:22 -07:00
items	[Frontend] type-icon evolving to universal t-item-icon	2015-10-28 00:24:57 -07:00
back-arrow.html	[Themes] Resolve conflicts	2015-09-22 16:12:44 -07:00
browse-object.html	[Frontend] Manual re-do of collapse/expand panes	2015-10-23 11:13:51 -07:00
browse.html	Merge remote-tracking branch 'github/master' into open233b	2015-11-04 09:28:19 -08:00
menu-arrow.html	[Browse] Splitting up Menu Gesture	2015-06-30 16:17:00 -07:00