diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /archaeological_finds/admin.py | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'archaeological_finds/admin.py')
| -rw-r--r-- | archaeological_finds/admin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py index fa2264a07..764f63ad3 100644 --- a/archaeological_finds/admin.py +++ b/archaeological_finds/admin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-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 @@ -89,7 +89,7 @@ class TreatmentTypeAdmin(admin.ModelAdmin): admin.site.register(models.TreatmentType, TreatmentTypeAdmin) general_models = [ - models.ConservatoryState, - models.PreservationType, models.IntegrityType] + models.ConservatoryState, models.RemarkabilityType, + models.PreservationType, models.IntegrityType, ] for model in general_models: admin.site.register(model, GeneralTypeAdmin) |