Merge remote-tracking branch 'origin/master' into Aufinal/change_shotgun

This commit is contained in:
Ludovic Stephan 2016-10-24 14:38:35 -02:00
commit b15dc6d9dc
7 changed files with 70 additions and 18 deletions

View file

@ -254,7 +254,7 @@ class SpectacleRevente(models.Model):
def expiration_time_str(self):
return self.expiration_time \
.astimezone(timezone.get_current_timezone()) \
.strftime('%D à %H:%M')
.strftime('%d/%m/%y à %H:%M')
def __str__(self):
return "%s -- %s" % (self.seller,