Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/Wraithh/sikteeri
Browse files Browse the repository at this point in the history
Conflicts:
	membership/unpaid_members.py
  • Loading branch information
joneskoo committed Oct 4, 2011
2 parents 7fc82a2 + 97ab5de commit 3840447
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion membership/unpaid_members.py
Expand Up @@ -9,5 +9,5 @@ def unpaid_members_data():
member = bc.membership
accounts = member.alias_set.filter(account=True)
for account in accounts:
unpaid_members.append((member.id, account))
unpaid_members.append((member.id, account.name))
return unpaid_members

0 comments on commit 3840447

Please sign in to comment.