Resolved merge conflicts with master

2022-01-23 16:01:44 -07:00
parent 55d1c2c446 ba65b471b3
commit 7cb200ab04
31 changed files with 1525 additions and 291 deletions
--- a/modpol_core/modules/remove_member_consent.lua
+++ b/modpol_core/modules/remove_member_consent.lua
@ -35,7 +35,7 @@ function remove_member_consent:initiate(result)
         self.org.members,
         function(input)
            self.data.member_to_remove = input
-            self.org:call_module(
+            self:call_module(
               "consent",
               self.initiator,
               {