| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
|
|
|
|
|
|
gitorious.org:chimere-example-project/chimere-example-project into v2.1
|
|
gitorious.org:chimere-example-project/chimere-example-project
Conflicts:
.gitignore
settings.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/static/chimere/css/styles.css
chimere/templates/chimere/blocks/areas.html
|
|
|
|
|
|
|