Merge branch 'master' of https://github.com/lejenome/less.js

Conflicts: lib/less/render.js
less · Jan 26, 2015 · d700715 · d700715
2 parents 31c3d04 + e000c78
commit d700715
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/less/parse.js b/lib/less/parse.js
@@ -46,6 +46,10 @@ module.exports = function(environment, ParseTree, ImportManager) {
                     entryPath: entryPath,
                     rootFilename: filename
                 };
+                // add in a missing trailing slash
+                if (rootFileInfo.rootpath && rootFileInfo.rootpath.slice(-1) !== "/") {
+                    rootFileInfo.rootpath += "/";
+                }
             }
 
             var imports = new ImportManager(context, rootFileInfo);