Christophe Vilayphiou f65bb9b323 Merge branch 'master' into desktop_harry ...

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

2012-04-06 19:02:39 +08:00

..

fonts

Ray's changes in announcenment back-end

2012-03-27 18:58:03 +08:00

images

Dock change and getting values from db

2012-04-06 17:49:22 +08:00

javascripts

Merge branch 'master' into desktop_harry

2012-04-06 19:02:39 +08:00

stylesheets

Merge branch 'master' into desktop_harry

2012-04-06 19:02:39 +08:00