Tue Nov 28 11:39:21 UTC 2017

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.17.3.1-spanfix,T9858,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,mpickering/import,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11017,wip/T11019,wip/T11028,wip/T11028-2,wip/T11028-3,wip/T11080-open-data-kinds,wip/T11258,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/import2,wip/new-tree-one-param,wip/orf-reboot,wip/rae,wip/rae-nokinds,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/spj-wildcard-refactor,wip/spj-wildcard-refactor2,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/7570ed8595402bcd354b7b24de1f4b0e3e527a58

>---------------------------------------------------------------

commit 7570ed8595402bcd354b7b24de1f4b0e3e527a58
Merge: 6a1d4a6 29c9681
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Sep 2 13:20:37 2015 +0200

    Merge pull request #443 from bgamari/ghc-head
    
    account for changes to ipClass


>---------------------------------------------------------------

7570ed8595402bcd354b7b24de1f4b0e3e527a58
 haddock-api/src/Haddock/Convert.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)