Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap ... Conflicts: Gemfile app/models/ad_banner.rb		2012-05-15 23:02:22 +08:00
..
assets	Changes for widgets	2012-05-13 21:55:39 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-15 23:02:22 +08:00
helpers	New Interface for App Auth and Object Auth	2012-05-14 00:50:12 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	Add impressionist	2012-05-15 21:26:09 +08:00
views	Merge branch 'design_team' into ldap	2012-05-15 23:02:22 +08:00