Resolve merge conflicts.

This commit is contained in:
Michael DeHaan
2013-04-17 20:35:01 -04:00
parent 7c5fcba037
commit 5336316f2e
2 changed files with 6 additions and 4 deletions

View File

@@ -43,6 +43,7 @@ class OrganizationsList(BaseList):
model = Organization
serializer_class = OrganizationSerializer
permission_classes = (CustomRbac,)
filter_fields = ('name',)
# I can see the organizations if:
# I am a superuser