Charles Hacskaylo 4f7ca98b60 Merge branch 'master' into nem468a. ... Many tweaks to fix some issues with tree, labels and Inspector. Conflicts: platform/commonUI/edit/res/templates/elements.html platform/commonUI/general/res/sass/search/_search.scss platform/commonUI/general/res/sass/tree/_tree.scss platform/commonUI/general/res/templates/object-inspector.html platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/snow/res/css/theme-snow.css platform/search/res/templates/search.html		2016-01-11 13:29:26 -08:00
..
res/templates	[Frontend] Fixed scrolling view	2015-11-12 13:24:28 -08:00
src	[Time Conductor] Use domain formats in scrolling list	2015-10-27 12:37:53 -07:00
test	[Time Conductor] Update RangeColumn spec	2015-12-30 10:10:23 -08:00
bundle.json	[Views] Fix glyphs	2015-01-27 14:50:45 -08:00