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
..
controls	[Mobile] IN PROGRESS: Styling on Create menu	2015-08-26 10:50:14 -07:00
overlay	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
search	[Mobile] IN PROGRESS: Re-orgs after merge of Shivam's mobile branch	2015-08-26 17:49:40 -07:00
_constants.scss	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
_item.scss	[Frontend] type-icon evolving to universal t-item-icon	2015-10-28 00:24:57 -07:00
_layout.scss	[Frontend] Mobile and margin tweaks	2015-10-30 17:22:41 -07:00
_mixins.scss	[Mobile] Gestures	2015-08-04 09:59:08 -07:00
_tree.scss	[Frontend] type-icon evolving to universal t-item-icon	2015-10-28 00:24:57 -07:00