Merge branch...

Merge branch '513-almost-adjacent-committee-memberships-should-keep-member-since-date' into 'master'

Combine almost-adjacent committee memberships on committee page

Closes #513

See merge request !621

website/activemembers/models.py

@@ -249,9 +249,11 @@ class CommitteeMembership(models.Model, metaclass=ModelTranslateMeta):
     @property
     def initial_connected_membership(self):
         """ Find the oldest membership directly connected to the current one"""
-        qs = CommitteeMembership.objects.filter(committee=self.committee,
-                                                member=self.member,
-                                                until=self.since)
+        qs = CommitteeMembership.objects.filter(
+            committee=self.committee,
+            member=self.member,
+            until__lte=self.since,
+            until__gte=self.since - datetime.timedelta(days=1))
         if qs.count() >= 1:  # should actually only be one; should be unique
             return qs.first().initial_connected_membership
         else: