]> git.parisson.com Git - mezzo.git/commitdiff
Mergin
authorEmilie <zawadzki@ircam.fr>
Mon, 19 Sep 2016 14:23:04 +0000 (16:23 +0200)
committerEmilie <zawadzki@ircam.fr>
Mon, 19 Sep 2016 14:23:04 +0000 (16:23 +0200)
1  2 
app/organization/network/admin.py
app/organization/network/models.py
app/organization/network/translation.py

index 1edef9614e936dfb58d3b11d17a163a04457a463,ea481d52a4d8e3ff47ee4acb1b2fd31dfaacb850..4057edef114532f60d5c7eb57458230e8f0986cd
@@@ -135,4 -122,4 +136,5 @@@ admin.site.register(DepartmentPage, Dep
  admin.site.register(Team, TeamAdmin)
  admin.site.register(TeamPage, TeamPageAdmin)
  admin.site.register(Person, PersonAdmin)
+ admin.site.register(ActivityStatus)
 +admin.site.register(PersonListBlock, PersonListBlockAdmin)
Simple merge