Christophe Vilayphiou 2eeb530422 Merge branch 'master' into ldap ...

Conflicts:
	app/assets/stylesheets/new_admin.css.erb

2012-04-23 14:13:37 +08:00

..

fonts

Ray's changes in announcenment back-end

2012-03-27 18:58:03 +08:00

images

add pic and js for permission checkbox and filter

2012-04-12 07:14:06 +08:00

javascripts

AdImage and AnBanner JS fixed

2012-04-23 14:07:13 +08:00

stylesheets

Merge branch 'master' into ldap

2012-04-23 14:13:37 +08:00