Daniel Pan ee99d7aad8 Merge branch '5.1' ...

Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js

2016-05-21 13:42:04 +08:00

..

assets

[dist] Update locales and dist

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

avatars

…

codemirror

…

cors

…

css

Merge branch '5.1'

2016-05-21 13:42:04 +08:00

img

Update logo to HiDPI

2016-04-06 19:44:11 +08:00

js

improved 'table' accessibility for 'non backbone' pages; bugfix for 'trash'

2016-04-24 18:21:46 +08:00

rest_framework

…