decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

merge changes

Browse source
This commit is contained in:
rolux 2014-12-23 12:04:25 +00:00
commit d1b0020fc7
6 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pandora/annotation/models.py
View file

@ -14,7 +14,6 @@ import ox
from clip.models import Clip from clip.models import Clip
from entity.models import Entity from entity.models import Entity
from changelog.models import Changelog
from item.utils import sort_string, get_by_key from item.utils import sort_string, get_by_key
import managers import managers

2
pandora/app/models.py
View file

@ -6,8 +6,6 @@ import json
from django.db import models from django.db import models
from changelog.models import Changelog
import monkey_patch import monkey_patch
class Page(models.Model): class Page(models.Model):

1
pandora/event/models.py
View file

@ -12,7 +12,6 @@ from item.models import Item
from item import utils from item import utils
from person.models import get_name_sort from person.models import get_name_sort
from title.models import get_title_sort from title.models import get_title_sort
from changelog.models import Changelog
import managers import managers

1
pandora/item/models.py
View file

@ -34,7 +34,6 @@ from data_api import external_data
from annotation.models import Annotation from annotation.models import Annotation
from archive import extract from archive import extract
from changelog.models import Changelog
from clip.models import Clip from clip.models import Clip
from entity.models import Entity from entity.models import Entity
from person.models import get_name_sort from person.models import get_name_sort

1
pandora/news/models.py
View file

@ -5,7 +5,6 @@ from __future__ import division, with_statement
from django.db import models from django.db import models
import ox import ox
from changelog.models import Changelog
import managers import managers

1
pandora/place/models.py
View file

@ -10,7 +10,6 @@ from ox.django import fields
import managers import managers
from annotation.models import Annotation, get_matches, get_super_matches from annotation.models import Annotation, get_matches, get_super_matches
from item.models import Item from item.models import Item
from changelog.models import Changelog
class Place(models.Model): class Place(models.Model):