diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-23 17:47:12 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-23 17:47:12 +0200 |
commit | ccc0243a4a43ea41b366521ea634d083918882a2 (patch) | |
tree | 6c383a7be3da1982c7f607cf42eacdb75a3040d9 | |
parent | a62bf85cf3782c9442c755a5ec9a3c5d633f0874 (diff) | |
parent | 50482dc18aebcd30347ddd7ec97c1514252fa1e3 (diff) | |
download | Chimère - projet Saclay-ccc0243a4a43ea41b366521ea634d083918882a2.tar.bz2 Chimère - projet Saclay-ccc0243a4a43ea41b366521ea634d083918882a2.zip |
Merge branch 'master' into v2.1
-rw-r--r-- | static/saclay/images/popup/welcome_logo-chronos.png | bin | 3690 -> 0 bytes |
-rw-r--r-- | static/saclay/images/popup/welcome_logo-paris-malaquais.png | bin | 3015 -> 0 bytes |
-rw-r--r-- | static/saclay/images/popup/welcome_logo-terre-et-cite.png | bin | 4305 -> 0 bytes |
-rw-r--r-- | static/saclay/images/popup/welcome_logos.png | bin | 9620 -> 0 bytes |
-rw-r--r-- | static/saclay/images/welcome_logo_chronos.png | bin | 5446 -> 0 bytes |
-rw-r--r-- | static/saclay/images/welcome_logo_malaquais.png | bin | 5306 -> 0 bytes |
-rw-r--r-- | static/saclay/images/welcome_logo_terre_et_cite.png | bin | 6152 -> 0 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/static/saclay/images/popup/welcome_logo-chronos.png b/static/saclay/images/popup/welcome_logo-chronos.png Binary files differdeleted file mode 100644 index fd3d6ca..0000000 --- a/static/saclay/images/popup/welcome_logo-chronos.png +++ /dev/null diff --git a/static/saclay/images/popup/welcome_logo-paris-malaquais.png b/static/saclay/images/popup/welcome_logo-paris-malaquais.png Binary files differdeleted file mode 100644 index 3aea586..0000000 --- a/static/saclay/images/popup/welcome_logo-paris-malaquais.png +++ /dev/null diff --git a/static/saclay/images/popup/welcome_logo-terre-et-cite.png b/static/saclay/images/popup/welcome_logo-terre-et-cite.png Binary files differdeleted file mode 100644 index 73fa913..0000000 --- a/static/saclay/images/popup/welcome_logo-terre-et-cite.png +++ /dev/null diff --git a/static/saclay/images/popup/welcome_logos.png b/static/saclay/images/popup/welcome_logos.png Binary files differdeleted file mode 100644 index e4ae163..0000000 --- a/static/saclay/images/popup/welcome_logos.png +++ /dev/null diff --git a/static/saclay/images/welcome_logo_chronos.png b/static/saclay/images/welcome_logo_chronos.png Binary files differdeleted file mode 100644 index f48b9b8..0000000 --- a/static/saclay/images/welcome_logo_chronos.png +++ /dev/null diff --git a/static/saclay/images/welcome_logo_malaquais.png b/static/saclay/images/welcome_logo_malaquais.png Binary files differdeleted file mode 100644 index d621aad..0000000 --- a/static/saclay/images/welcome_logo_malaquais.png +++ /dev/null diff --git a/static/saclay/images/welcome_logo_terre_et_cite.png b/static/saclay/images/welcome_logo_terre_et_cite.png Binary files differdeleted file mode 100644 index 4a25472..0000000 --- a/static/saclay/images/welcome_logo_terre_et_cite.png +++ /dev/null |