haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 05:39:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '5.1'

Browse Source 
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
This commit is contained in:
zhengxie
2016-07-21 10:55:50 +08:00
parent 8536d20eda 5c2616ed30
commit 57cc2b4aba
27 changed files with 659 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/settings.py
View File

@@ -345,6 +345,8 @@ REST_FRAMEWORK = {
'anon': '5/minute',
'user': '300/minute',
},
# https://github.com/tomchristie/django-rest-framework/issues/2891
'UNICODE_JSON': False,
}
# file and path