Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap ...

Conflicts:
	Gemfile
	app/models/ad_banner.rb

2012-05-15 23:02:22 +08:00

..

announcement

Merge branch 'design_team' into ldap

2012-05-15 23:02:22 +08:00

news

Add impressionist

2012-05-15 21:26:09 +08:00

page_content

Add each page name to page_context index

2012-05-15 21:31:54 +08:00

web_resource

Merge branch 'design_team' into ldap

2012-05-14 00:57:17 +08:00