orbit-basic/app/views
Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap
Conflicts:
	config/environments/development.rb
2012-05-09 13:51:00 +08:00
..
admin Merge branch 'design_team' into ldap 2012-05-09 13:51:00 +08:00
devise Merge branch 'design_team' into ldap 2012-04-30 07:57:20 +08:00
js Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
kaminari Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
layouts Merge branch 'design_team' into ldap 2012-05-09 13:51:00 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00