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
..
admin	Comment out code that bugged upload image in ad_banner	2012-04-13 15:53:25 +08:00
desktop	Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua	2012-07-04 18:31:00 +08:00
devise	Remove class 'error' in devise forms	2012-02-29 04:56:32 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Announcement modifications and tags	2012-02-15 00:34:22 +08:00
layouts	Merge branch 'master' into desktop_harry	2012-04-13 13:39:00 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00