Merge remote-tracking branch 'josh/master'

This commit is contained in:
Ralph Minderhoud 2018-04-06 20:37:52 -05:00
commit 0a901faa74
10 changed files with 195 additions and 136 deletions

View file

@ -103,7 +103,6 @@ can optionally add yourself if you plan to create non-chronological content)::
├── content
│   └── (pages)
├── output
├── develop_server.sh
├── fabfile.py
├── Makefile
├── pelicanconf.py # Main settings file