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	Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry	2012-06-29 16:10:29 +08:00
controllers	Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry	2012-06-29 16:10:29 +08:00
helpers	Clean up code , cache other auths. Fix sidebar	2012-05-29 17:17:26 +08:00
jobs	add script for cache user	2012-05-29 17:17:26 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry	2012-06-29 16:10:29 +08:00
uploaders	Comment out filename in FIleAssetUploader	2012-05-17 23:34:15 +08:00
views	Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry	2012-06-29 16:10:29 +08:00