Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/nephila/feature/test_fix' …
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
stefanfoulis committed Oct 28, 2012
2 parents ab40df5 + 1c5b706 commit 4acfe5a
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion filer/tests/__init__.py
@@ -1,6 +1,5 @@
#-*- coding: utf-8 -*-
from filer.tests.admin import *
from filer.tests.fields import *
from filer.tests.models import *
from filer.tests.permissions import *
from filer.tests.server_backends import *
Expand Down

0 comments on commit 4acfe5a

Please sign in to comment.