|
|
@@ -41,7 +41,6 @@ def send_registration_notification(sender, user, request=None, **kwargs):
|
|
|
settings.DEFAULT_FROM_EMAIL,
|
|
|
settings.NOTIFICATION_EMAILS,
|
|
|
fail_silently=False)
|
|
|
-=======
|
|
|
|
|
|
class MemberManager(UserManager):
|
|
|
def manageable_by(self, user):
|
|
|
@@ -53,7 +52,6 @@ class MemberManager(UserManager):
|
|
|
else:
|
|
|
offers = Offer.objects.manageable_by(user)
|
|
|
return super(MemberManager, self).filter(offersubscription__offer__in=offers).distinct()
|
|
|
->>>>>>> upstream/master
|
|
|
|
|
|
|
|
|
class Member(CoinLdapSyncMixin, AbstractUser):
|
ljf