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
..
assets	Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua	2012-07-04 18:31:00 +08:00
controllers	Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua	2012-07-04 18:31:00 +08:00
helpers	Fix side_bar.	2012-04-12 18:14:00 +08:00
models	new page add and timeline changes	2012-06-28 17:31:48 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua	2012-07-04 18:31:00 +08:00