Merge branch 'master' into lqc-trunk

[redakcja.git] / platforma / urls.py

diff --git a/platforma/urls.py b/platforma/urls.py
index 8a56210..1f7372a 100755 (executable)
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -24,6 +24,7 @@ urlpatterns = patterns('',
     url(r'^file/(?P<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"),
 
     # Admin panel
+    (r'^admin/filebrowser/', include('filebrowser.urls')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(.*)', admin.site.root),