Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

2012-06-29 16:10:29 +08:00

..

fonts

Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

2012-06-29 16:10:29 +08:00

images

Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

2012-06-29 16:10:29 +08:00

javascripts

Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

2012-06-29 16:10:29 +08:00

stylesheets

Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

2012-06-29 16:10:29 +08:00