Merge orphan commit into branch 'upstream/master'
Sometime in mid-January there was a force-push to upstream's `master` repository, making 6e202edc an orphan commit. Unfortunately, there was a period of time when GHC's `time` submodule referred to this commit, which means that we need to ensure it remains accessible in the history. This merge folds this commit into the `master` branch.
No related branches found
No related tags found
Showing
- Checklist 61 additions, 0 deletionsChecklist
- benchmark/stack.yaml 1 addition, 1 deletionbenchmark/stack.yaml
- changelog.md 4 additions, 0 deletionschangelog.md
- lib/Data/Time/Calendar/Gregorian.hs 5 additions, 5 deletionslib/Data/Time/Calendar/Gregorian.hs
- lib/Data/Time/Calendar/Julian.hs 5 additions, 5 deletionslib/Data/Time/Calendar/Julian.hs
- lib/Data/Time/Calendar/JulianYearDay.hs 5 additions, 5 deletionslib/Data/Time/Calendar/JulianYearDay.hs
- lib/Data/Time/Calendar/MonthDay.hs 8 additions, 8 deletionslib/Data/Time/Calendar/MonthDay.hs
- lib/Data/Time/Calendar/OrdinalDate.hs 20 additions, 20 deletionslib/Data/Time/Calendar/OrdinalDate.hs
- lib/Data/Time/Calendar/Private.hs 17 additions, 23 deletionslib/Data/Time/Calendar/Private.hs
- lib/Data/Time/Calendar/WeekDate.hs 5 additions, 5 deletionslib/Data/Time/Calendar/WeekDate.hs
- lib/Data/Time/Clock/Internal/SystemTime.hs 8 additions, 4 deletionslib/Data/Time/Clock/Internal/SystemTime.hs
- lib/Data/Time/Clock/Internal/UTCTime.hs 1 addition, 1 deletionlib/Data/Time/Clock/Internal/UTCTime.hs
- lib/Data/Time/Clock/System.hs 1 addition, 0 deletionslib/Data/Time/Clock/System.hs
- lib/Data/Time/Format.hs 167 additions, 80 deletionslib/Data/Time/Format.hs
- lib/Data/Time/Format/Parse.hs 2 additions, 2 deletionslib/Data/Time/Format/Parse.hs
- lib/Data/Time/LocalTime.hs 7 additions, 2 deletionslib/Data/Time/LocalTime.hs
- lib/Data/Time/LocalTime/Internal/LocalTime.hs 4 additions, 4 deletionslib/Data/Time/LocalTime/Internal/LocalTime.hs
- lib/Data/Time/LocalTime/Internal/TimeOfDay.hs 8 additions, 8 deletionslib/Data/Time/LocalTime/Internal/TimeOfDay.hs
- lib/Data/Time/LocalTime/Internal/TimeZone.hs 19 additions, 15 deletionslib/Data/Time/LocalTime/Internal/TimeZone.hs
- lib/Data/Time/LocalTime/Internal/ZonedTime.hs 1 addition, 1 deletionlib/Data/Time/LocalTime/Internal/ZonedTime.hs
Loading
Please register or sign in to comment