Merge branch 'master' into v2

062b83f1 · Johannes Bill · 1fc4f47e · 9a605846 · 062b83f1
Commit 062b83f1 authored Oct 02, 2015 by Johannes Bill
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

dateArray.js lib/dateArray.js +1 -1

No files found.
--- a/lib/dateArray.js
+++ b/lib/dateArray.js
@@ -44,8 +44,8 @@ function wrapper(_epochSpan) {
      var holidayIntervals = holidays.map(function (date) {
        return tmUtils.singleDay(date);
      });
-      holidayIntervals = tmUtils.andOp(holidayIntervals, [epochSpan]);
      tmUtils.sort(holidayIntervals);
+      holidayIntervals = tmUtils.andOp(holidayIntervals, [epochSpan]);
      try {
        var ret = {holidays: holidays};