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

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

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

..

admin

Merge branch 'master' into ldap

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

devise

NCCU ldap debug

2012-04-23 10:13:44 +08:00

js

…

kaminari

…

layouts

Merge branch 'master' into ldap

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

.swp

…