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 '6.0'

Browse Source 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
This commit is contained in:
zhengxie
2017-02-17 17:11:33 +08:00
parent 096e2e06bb 08ce98ec19
commit d82df5fb52
176 changed files with 44016 additions and 40721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/settings.py
View File

@@ -35,7 +35,7 @@ DATABASES = {
# although not all choices may be available on all operating systems.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'Asia/Shanghai'
TIME_ZONE = 'UTC'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html