mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-01 23:20:51 +00:00
Merge branch 'pubinfo'
Conflicts: thirdpart/seaserv/__init__.py views.py
This commit is contained in:
4
urls.py
4
urls.py
@@ -114,7 +114,9 @@ if CLOUD_MODE:
|
||||
)
|
||||
else:
|
||||
urlpatterns += patterns('',
|
||||
(r'^pubinfo/$', pubinfo),
|
||||
url(r'^pubinfo/libraries/$', pubrepo, name='pubrepo'),
|
||||
(r'^publicrepo/create/$', public_repo_create),
|
||||
url(r'^pubinfo/groups/$', pubgrp, name='pubgrp'),
|
||||
url(r'^pubinfo/users/$', pubuser, name='pubuser'),
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user