Orbit/app/assets
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
..
fonts Fix css bugs (opacity=) and changes in sign_in page 2012-04-27 15:27:59 +08:00
images Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
javascripts DRY code for sorting 2012-04-30 06:30:52 +08:00
stylesheets Merge branch 'design_team' into ldap 2012-04-30 07:57:20 +08:00