Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gitorious.org:chimere-example-project/chimere-example-project into v2.1
|
|
gitorious.org:chimere-example-project/chimere-example-project
Conflicts:
.gitignore
settings.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
settings.py
|
|
|
|
ssh://daenerys.peacefrogs.net/var/local/git/chimere_example_project into v2.0
|
|
|
|
|
|
|
|
|
|
Conflicts:
settings.py
|
|
|
|
|