From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 Jan 2014 12:09:41 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dafd447d59d70d85de945a410d1fb95fb6a642bd;p=telemeta.git

Merge branch 'dev' into crem2

Conflicts:
	telemeta/models/media.py
	telemeta/urls.py
---

dafd447d59d70d85de945a410d1fb95fb6a642bd
diff --cc telemeta/urls.py
index 5b7a2fa7,bb85197e..bcbf6a15
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@@ -39,9 -39,8 +39,8 @@@ from django.conf import setting
  from django.views.generic.simple import redirect_to
  from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFonds
  from telemeta.views import HomeView, AdminView, CollectionView, ItemView, \
-                                 InstrumentView, PlaylistView, ProfileView, GeoView, \
-                                 LastestRevisionsFeed, ResourceView, UserRevisionsFeed, \
-                                 CollectionPackageView
 -                                InstrumentView, InstrumentAliasView, PlaylistView, ProfileView, GeoView, \
 -                                LastestRevisionsFeed, ResourceView, UserRevisionsFeed
++                            InstrumentView, InstrumentAliasView, PlaylistView, ProfileView, GeoView, \
++                            LastestRevisionsFeed, ResourceView, UserRevisionsFeed, CollectionPackageView
  from jsonrpc import jsonrpc_site
  import os.path
  import telemeta.config