ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 01:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4926ccb07b
openmct/platform/commonUI/themes
History
Victor Woeltjen dbf196e014 Merge remote-tracking branch 'github/master' into open477 
Resolve conflicts to complete merge of #477

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
2016-01-27 12:53:46 -08:00
..
espresso Merge remote-tracking branch 'github/master' into open477 2016-01-27 12:53:46 -08:00
snow Merge remote-tracking branch 'github/master' into open477 2016-01-27 12:53:46 -08:00