diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-22 21:04:43 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-22 21:04:43 +0100 |
| commit | 906a299b4c07d4e6f0a31cd6504926cf7ff7cc66 (patch) | |
| tree | 6f05955d3b12933817813d02a1c7aaa856e3efe7 /chimere/search_indexes.py | |
| parent | 49a981c28c1c47ee548859f0490fa157acf9b1ba (diff) | |
| parent | ed6c1559c44bdc3214cd2dffb377359601b28a33 (diff) | |
| download | Chimère-906a299b4c07d4e6f0a31cd6504926cf7ff7cc66.tar.bz2 Chimère-906a299b4c07d4e6f0a31cd6504926cf7ff7cc66.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/admin.py
chimere/models.py
chimere/static/chimere/css/styles.css
chimere/urls.py
chimere/views.py
Diffstat (limited to 'chimere/search_indexes.py')
| -rw-r--r-- | chimere/search_indexes.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/search_indexes.py b/chimere/search_indexes.py index 5e4a69a..edf9bd1 100644 --- a/chimere/search_indexes.py +++ b/chimere/search_indexes.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2014 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2014-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # # This program is free software: you can redistribute it and/or modify |