Tue Nov 28 11:46:29 UTC 2017

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

On branches: alexbiehl-patch-1,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.18,wip-located-module-as,wip/D2418,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,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/e82d093a9b3fb68486920896a3d67d84a822cbc5

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

commit e82d093a9b3fb68486920896a3d67d84a822cbc5
Merge: 1bfcca3 d100c8f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon May 16 19:58:51 2016 +0200

    Merge remote-tracking branch 'origin/master' into ghc-head


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

e82d093a9b3fb68486920896a3d67d84a822cbc5
 .gitmodules                                           | 3 ---
 doc/alabaster                                         | 1 -
 doc/conf.py                                           | 1 -
 haddock-api/resources/html/Classic.theme/xhaddock.css | 4 ++++
 haddock-api/resources/html/Ocean.std-theme/ocean.css  | 3 +++
 haddock.cabal                                         | 2 +-
 html-test/ref/ocean.css                               | 3 +++
 7 files changed, 11 insertions(+), 6 deletions(-)