diff options
author | Ben Gamari <ben@smart-cactus.org> | 2016-05-16 19:58:51 +0200 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2016-05-16 19:58:51 +0200 |
commit | e82d093a9b3fb68486920896a3d67d84a822cbc5 (patch) | |
tree | e077d4952029c647e73ea51d481c4d7cc29feb34 /doc | |
parent | 1bfcca3f2212e1f8e527ad3a2c4bb48aef082ff9 (diff) | |
parent | d100c8f38e8ee6c7e6ba291afbf2c9eaf4f7743d (diff) |
Merge remote-tracking branch 'origin/master' into ghc-head
Diffstat (limited to 'doc')
m--------- | doc/alabaster | 0 | ||||
-rw-r--r-- | doc/conf.py | 1 |
2 files changed, 0 insertions, 1 deletions
diff --git a/doc/alabaster b/doc/alabaster deleted file mode 160000 -Subproject aabda1182083d21b6d9bafb53ea8a99eb4be4cf diff --git a/doc/conf.py b/doc/conf.py index 6e73eb5c..d6b8bda8 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -29,7 +29,6 @@ pygments_style = 'tango' # -- Options for HTML output ---------------------------------------------- -html_theme_path = ['./alabaster'] html_theme = 'alabaster' htmlhelp_basename = 'Haddockdoc' |