Mercurial > kallithea
comparison docs/conf.py @ 3178:a64e663abda3 beta
fixed bad merge on git fetch fix
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 20 Jan 2013 23:17:45 +0100 |
| parents | aa90719e8520 |
| children | 7e5f8c12a3fc |
comparison
equal
deleted
inserted
replaced
| 3177:48a18391f6da | 3178:a64e663abda3 |
|---|