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

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

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

..

assets

Merge branch 'master' into desktop_harry

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

controllers

theme changes

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

helpers

Ray's changes for orbit bar

2012-04-06 18:06:57 +08:00

models

Dock change and getting values from db

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

uploaders

Modifications for images in html code

2011-10-18 11:21:24 +08:00

views

Merge branch 'master' into desktop_harry

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