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

Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json

2012-05-10 00:34:23 +08:00

..

announcement

Merge branch 'design_team' into ldap

2012-05-10 00:34:23 +08:00

news

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-05-10 00:29:22 +08:00

page_content

Put sorting in web_link, page_context and design

2012-05-05 21:20:20 +08:00

web_resource

Merge branch 'design_team' into ldap

2012-05-10 00:34:23 +08:00