Merge branch 'master' of github.com:boonex/dolphin

.gitignore

@@ -22,3 +22,6 @@ Thumbs.db
 build.properties
 tests/vendor
 tests/composer.phar
+
+# Exclude custom modules
+modules/boonex/air/*

inc/classes/BxDolTemplate.php

@@ -1971,6 +1971,12 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
     }
     function _getAbsoluteLocationCss($sType, $sName)
     {
+    	$sNameLess = str_replace('.css', '.less', $sName);
+
+    	$sResult = $this->_getAbsoluteLocation($sType, $this->_sFolderCss, $sNameLess);
+    	if(!empty($sResult))
+    		return $sResult;
+
         return $this->_getAbsoluteLocation($sType, $this->_sFolderCss, $sName);
     }
     /**