| Age | Commit message (Collapse) | Author |
|
Conflicts:
chimere/admin.py
chimere/forms.py
chimere/models.py
chimere/static/chimere/js/jquery.chimere.js
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/admin.py
chimere/forms.py
example_project/settings.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and add a specific page for news)
|
|
|
|
|
|
|
|
management
|
|
|
|
|