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

..

collections

[group discussion] added 'load more'

2016-03-25 17:54:53 +08:00

models

Improve Accessibility (#1113)

2016-04-13 20:10:30 +08:00

views

Merge branch '5.1'

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

main.js

[backbone] Merge into one library app

2015-04-22 15:31:49 +08:00

router.js

Add nav footer

2016-05-13 20:11:20 +08:00