Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap ...

Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-05-08 11:40:38 +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

2012-05-04 19:11:28 +08:00

javascripts

Ray's changes

2012-05-04 19:11:28 +08:00

stylesheets

Merge branch 'design_team' into ldap

2012-05-08 11:40:38 +08:00