Another pull/push fix.

[redakcja.git] / apps / api / urls.py

diff --git a/apps/api/urls.py b/apps/api/urls.py
index db6ff1e..0ed6459 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -74,7 +74,11 @@ urlpatterns = patterns('',
 
     # MERGE
     url(urlpath(r'documents', DOC, 'revision', format=False),
-        document_merge, {'emitter_format': 'json'}, name="docmerge_view")
+        document_merge, {'emitter_format': 'json'}, name="docmerge_view"),
+        
+    url(r'diffs/(?P<source_revision>latest|[0-9a-fA-F]+)/(?P<target_revision>latest|[0-9a-fA-F]+)/$',
+        diff_resource, {'emitter_format': 'raw'}, name="diff_resource"),
+    
 
 #    url(r'^documents/(?P<docid>[^/]+)/parts$',
 #        document_resource, {'emitter_format': 'json'},