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
..
_tree.scss	Merge branch 'master' into nem468a.	2016-01-11 13:29:26 -08:00