Age | Commit message (Collapse) | Author |
|
Conflicts:
static/saclay/css/styles.css
templates/chimere/detail.html
|
|
ssh://git.proxience.com/home/proxience/git/chimere_saclay into master-v2.2
Conflicts:
settings.py
|
|
|
|
|
|
|
|
|
|
Conflicts:
templates/chimere/blocks/map.html
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
buttons)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|