diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-13 12:50:56 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-13 12:50:56 +0100 |
| commit | b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2 (patch) | |
| tree | 4e3a62ab9577dbd5ce6c790fcf76d3ebd11babb4 /chimere/templates/500.html | |
| parent | c5e865bc70b824db3c547c3da2f559d6c78cfbec (diff) | |
| parent | 6039e8b31fefc499499f82b5e5f31caea1f55be6 (diff) | |
| download | Chimère-b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2.tar.bz2 Chimère-b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2.zip | |
Merge branch 'master' into carte-ouverte
Conflicts:
chimere/templates/404.html
chimere/templates/500.html
Diffstat (limited to 'chimere/templates/500.html')
| -rw-r--r-- | chimere/templates/500.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chimere/templates/500.html b/chimere/templates/500.html index e84408e..4f9afa1 100644 --- a/chimere/templates/500.html +++ b/chimere/templates/500.html @@ -13,4 +13,3 @@ </div> </body> </html> - |