diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-03 16:52:09 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-03 16:52:09 +0100 | 
| commit | b60a1e62355695783e25b0f8054aaab7d40b73e0 (patch) | |
| tree | 13d9dca2d51e2092c8bb079cb798b3bae4171867 /ishtar_common/admin.py | |
| parent | d780b41a41127fb391ce7ad059b4aa55d632e185 (diff) | |
| parent | 06034b6c15b3ae6cc61003520eb564091c42d8f0 (diff) | |
| download | Ishtar-b60a1e62355695783e25b0f8054aaab7d40b73e0.tar.bz2 Ishtar-b60a1e62355695783e25b0f8054aaab7d40b73e0.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/admin.py')
| -rw-r--r-- | ishtar_common/admin.py | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index b3e0763b5..bee35256f 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -161,7 +161,7 @@ admin.site.register(models.GlobalVar, GlobalVarAdmin)  class GeneralTypeAdmin(admin.ModelAdmin): -    list_display = ['label', 'txt_idx', 'available'] +    list_display = ['label', 'txt_idx', 'available', 'comment']      actions = ['import_generic']      import_generic = gen_import_generic | 
