diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-07-16 22:28:38 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-07-16 22:28:38 +0200 |
| commit | 7e2f7de59cb0000b132f2e8767bc496431d1935f (patch) | |
| tree | bcc5a05539d6cc7375a5dc9e8a3aea414c8ae525 /archaeological_files/models.py | |
| parent | 45c418d867ec7a0fda582686d2f33ba8a694a930 (diff) | |
| parent | d058c10237b024961426e9f5344df8d214b29f51 (diff) | |
| download | Ishtar-7e2f7de59cb0000b132f2e8767bc496431d1935f.tar.bz2 Ishtar-7e2f7de59cb0000b132f2e8767bc496431d1935f.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'archaeological_files/models.py')
| -rw-r--r-- | archaeological_files/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 2b0b299ec..4c9705641 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012-2014 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as |