Merge remote-tracking branch 'origin/master'

This commit is contained in:
Raynaldo Rivera 2014-12-05 20:47:41 -07:00
commit 4be18a58b4

View File

@ -6,6 +6,8 @@ from eveonline.models import EveCorporationInfo
class Timer(models.Model):
class Meta:
ordering = ['eve_time']
name = models.CharField(max_length=254, default="")
system = models.CharField(max_length=254, default="")
planet_moon = models.CharField(max_length=254, default="")
@ -15,4 +17,4 @@ class Timer(models.Model):
important = models.BooleanField(default=False)
eve_character = models.ForeignKey(EveCharacter)
eve_corp = models.ForeignKey(EveCorporationInfo)
user = models.ForeignKey(User)
user = models.ForeignKey(User)