This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
assets	…
desktop_themes	…
desktop_widgets	…
static	…
404.html	…
422.html	…
500.html	…
favicon.ico	…
robots.txt	…
test.json	…