Christophe Vilayphiou f65bb9b323 Merge branch 'master' into desktop_harry ... Conflicts: app/assets/stylesheets/style.css.erb		2012-04-06 19:02:39 +08:00
..
admin	Fix mainTablePosition in js -> remove the notable class	2012-04-05 14:55:41 +08:00
desktop	Dock change and getting values from db	2012-04-06 17:49:22 +08:00
devise	Remove class 'error' in devise forms	2012-02-29 04:56:32 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Announcement modifications and tags	2012-02-15 00:34:22 +08:00
layouts	Merge branch 'master' into desktop_harry	2012-04-06 19:02:39 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00