Daniel Pan 94ace17c26 Replace folder-icon-24.png with folder-icon.png ...

Conflicts:
	seahub/group/templates/group/group_discuss.html
	seahub/group/templates/group/new_msg_reply.html

2016-03-31 13:42:47 +08:00

..

assets

[dist] Update locales and dist

2015-07-07 14:08:43 +08:00

avatars

…

codemirror

…

cors

…

css

Merge pull request #1080 from haiwen/HLItemView

2016-03-31 13:37:46 +08:00

img

Replace folder-icon-24.png with folder-icon.png

2016-03-31 13:42:47 +08:00

js

Merge branch '5.0'

2016-03-28 12:16:30 +08:00

rest_framework

…