From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Jul 2012 13:16:39 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 0.7-dev^2~55
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bbd9e85ce3084c3895b300a4e1437de758cb292b;p=teleforma.git

Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev

Conflicts:
	teleforma/management/commands/teleforma-import-conferences.py
---

bbd9e85ce3084c3895b300a4e1437de758cb292b
diff --cc teleforma/management/commands/teleforma-import-conferences.py
index 1025092c,3cc8a162..ccdd689f
--- a/teleforma/management/commands/teleforma-import-conferences.py
+++ b/teleforma/management/commands/teleforma-import-conferences.py
@@@ -52,8 -43,14 +52,19 @@@ class Command(BaseCommand)
          all_conferences = Conference.objects.all()
          i = 1
  
++<<<<<<< HEAD
 +	self.cleanup()
 +		
++=======
+         #FIXME:
+         medias = Media.objects.all()
+         for media in medias:
+             media.delete()
+         items = MediaItem.objects.all()
+         for item in items:
+             item.delete()
+ 
++>>>>>>> 278a443740c34a129f84eb61a443b547a678cb48
          for root, dirs, files in os.walk(self.media_dir):
              for filename in files:
                  name = os.path.splitext(filename)[0]