Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into loader-config
# Conflicts:
#	lib/loader.js
  • Loading branch information
Marat Dreizin committed Sep 28, 2016
commit a0a43f625b16061cea94b4817293816b0e78a568
1 change: 1 addition & 0 deletions lib/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var path = require("path");
var loaderUtils = require("loader-utils");
var processCss = require("./processCss");
var getImportPrefix = require("./getImportPrefix");
var compileExports = require("./compile-exports");
var getLoaderConfig = require("./getLoaderConfig");


Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.