This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap ...

Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

2012-04-30 07:57:20 +08:00

..

assets

Merge branch 'design_team' into ldap

2012-04-30 07:57:20 +08:00

controllers

Merge branch 'design_team' into ldap

2012-04-30 07:57:20 +08:00

helpers

Separate announcement and news

2012-04-30 06:31:46 +08:00

models

Merge branch 'design_team' into ldap

2012-04-24 15:28:52 +08:00

uploaders

Modifications for images in html code

2011-10-18 11:21:24 +08:00

views

Merge branch 'design_team' into ldap

2012-04-30 07:57:20 +08:00