This did not fast-forward merge because I'd made changes to those files since Martin submitted his merge request. This merge brings in the changes contributed in the following two commits from Martin: commit |
||
|---|---|---|
| .. | ||
| apps | ||
| static | ||
| templates | ||
| __init__.py | ||
| feeds.py | ||
| frontpage.py | ||
| manage.py | ||
| middleware.py | ||
| settings.py | ||
| urls.py | ||