| Age | Commit message (Collapse) | Author |
|
This reverts commit fdd11f64dd1cfae3399d607777eb1e9efb0dfeca.
|
|
|
|
Conflicts:
static/saclay/css/saclay.css
static/saclay/css/styles.css
templates/chimere/main_map.html
|
|
Conflicts:
static/saclay/css/saclay.css
static/saclay/css/styles.css
templates/chimere/base.html
templates/chimere/detail.html
templates/chimere/main_map.html
|
|
|
|
|
|
|
|
Conflicts:
templates/chimere/detail.html
|
|
|
|
Conflicts:
static/saclay/css/styles.css
templates/chimere/detail.html
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
static/saclay/css/styles.css
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
templates/chimere/blocks/map.html
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|