Skip to content
This repository
Browse code

Merge branch '1.0-branch'

  • Loading branch information...
commit 7a6681c281b28a56d6068feff15a35e616ef5ccf 2 parents 73e0895 + 6bc4d58
Chris McDonough mcdonc authored

Showing 2 changed files with 6 additions and 7 deletions. Show diff stats Hide diff stats

  1. +4 4 docs/authorintro.rst
  2. +2 3 docs/copyright.rst
8 docs/authorintro.rst
Source Rendered
@@ -158,6 +158,7 @@ others' technology.
158 158 single: Hathaway, Shane
159 159 single: Akkerman, Wichert
160 160 single: Laflamme, Blaise
  161 + single: Laflamme, Hugues
161 162 single: Bangert, Ben
162 163 single: Duncan, Casey
163 164 single: Orr, Mike
@@ -175,10 +176,9 @@ software. Without the help of these folks, neither this book nor the
175 176 software which it details would exist: Paul Everitt, Tres Seaver, Andrew
176 177 Sawyers, Malthe Borch, Carlos de la Guardia, Chris Rossi, Shane Hathaway,
177 178 Daniel Holth, Wichert Akkerman, Georg Brandl, Blaise Laflamme, Ben Bangert,
178   -Casey Duncan, Mike Orr, John Shipman, Simon Oram and Nat Hardwick of
179   -Electrosoup, Ian Bicking of the Open Planning Project, Jim Fulton of Zope
180   -Corporation, Tom Moroz of the Open Society Institute, and Todd Koym of
181   -Environmental Health Sciences.
  179 +Casey Duncan, Hugues Laflamme, Mike Orr, John Shipman, Simon Oram, Nat
  180 +Hardwick, Ian Bicking, Jim Fulton, Tom Moroz of the Open Society Institute,
  181 +and Todd Koym of Environmental Health Sciences.
182 182
183 183 Thanks to Guido van Rossum and Tim Peters for Python.
184 184
5 docs/copyright.rst
Source Rendered
@@ -52,14 +52,13 @@ Editor:

0 comments on commit 7a6681c

Please sign in to comment.
Something went wrong with that request. Please try again.