zhengxie d37144ef75 Merge branch '6.2' ...

Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js

2017-12-28 15:47:18 +08:00

..

assets

update rm ajax

2017-02-07 16:03:46 +08:00

avatars

…

codemirror

…

cors

…

css

Merge branch '6.2'

2017-12-28 15:47:18 +08:00

img

[folder icon] change back to the yellow ones

2017-12-15 13:38:18 +08:00

js

Merge branch '6.2'

2017-12-28 15:47:18 +08:00

office-template

update new office file

2016-12-15 13:50:04 +08:00

rest_framework

…