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

save asset static file

2010-02-05 16:15:16 +08:00

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

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

422.html

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

500.html

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

favicon.ico

init rails 2.3.2

2009-05-08 00:53:18 +08:00

robots.txt

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00

test.json

Timeline commit

2012-06-26 15:59:28 +08:00