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

..

desktop

lots of change

2012-05-02 17:04:16 +08:00

websymbols-regular-webfont.eot

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00

websymbols-regular-webfont.svg

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00

websymbols-regular-webfont.ttf

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00

websymbols-regular-webfont.woff

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00