ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-07 19:40:28 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
openmct/platform/commonUI/themes
History
Victor Woeltjen ab01f64cea Merge remote-tracking branch 'github/master' into open236 
Resolve CSS conflicts for nasa/openmctweb#236

Conflicts:
	platform/commonUI/general/res/sass/controls/_controls.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-04 13:02:17 -08:00
..
espresso
Merge remote-tracking branch 'github/master' into open236
2015-11-04 13:02:17 -08:00
snow
Merge remote-tracking branch 'github/master' into open236
2015-11-04 13:02:17 -08:00