Joshua Milton 6b9926539d Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua ... Conflicts: app/assets/javascripts/orbitdesktop.js app/controllers/desktop_publications_controller.rb config/routes.rb		2012-07-04 18:31:00 +08:00
..
fonts	lots of change	2012-05-02 17:04:16 +08:00
images	Connection page design	2012-05-01 18:05:17 +08:00
javascripts	Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua	2012-07-04 18:31:00 +08:00
stylesheets	timeline updates major ones..	2012-06-26 21:09:33 +08:00