diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-17 11:34:46 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-17 11:34:46 +0100 |
| commit | 5234c8418712d96c7510cf560a1188a9075a6dec (patch) | |
| tree | d5bd49d368d022cb4ad5d935b7387653cf22533f /version.py | |
| parent | 26ea6c74f4585a2b675cc73aab718ca7267d205a (diff) | |
| parent | 742993dcdf44595c6940275d4b048f001cc81d05 (diff) | |
| download | Chimère - projet Saclay-5234c8418712d96c7510cf560a1188a9075a6dec.tar.bz2 Chimère - projet Saclay-5234c8418712d96c7510cf560a1188a9075a6dec.zip | |
Merge branch 'master-v3.0' into saclay-v3.0
Conflicts:
static/saclay/css/styles.css
Diffstat (limited to 'version.py')
0 files changed, 0 insertions, 0 deletions