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	Custom thème done and theme id done…	2012-04-17 21:15:40 +08:00
desktop_widgets	Commit for app window..	2012-05-25 15:41:07 +08:00
static	Ray's changes	2012-05-09 04:15:02 +08:00
404.html	…
422.html	…
500.html	…
favicon.ico	…
robots.txt	…
test.json	Timeline commit	2012-06-26 15:59:28 +08:00