diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
| commit | d4119bdffd893943263a82813f6b783fda0253dd (patch) | |
| tree | 8e2be9071d39542da68661a27bc402874314798a /archaeological_warehouse/views.py | |
| parent | a39f989e9c02bca9e4c3127fde855364f392e3a5 (diff) | |
| parent | 5e7cda4fe8902979dac8a8008908accb8f0bfab4 (diff) | |
| download | Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.tar.bz2 Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.zip | |
Merge branch 'master' into v0.9
Conflicts:
install/install.sh
Diffstat (limited to 'archaeological_warehouse/views.py')
| -rw-r--r-- | archaeological_warehouse/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index be5e6150c..486c2a1e0 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 É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 |