Christophe Vilayphiou 03b5827392 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ... Conflicts: app/controllers/application_controller.rb app/views/layouts/_side_bar.html.erb		2012-09-14 00:03:52 +08:00
..
assets	Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit	2012-09-12 16:48:33 +08:00
controllers	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-09-14 00:03:52 +08:00
helpers	event_calendar testing	2012-09-13 23:57:47 +08:00
jobs	NCCU 上傳版本 0709	2012-07-09 16:02:59 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	break down Ray's HTML	2012-09-14 00:02:22 +08:00
uploaders	gallery frontend update	2012-09-12 02:05:10 +08:00
views	break down Ray's HTML	2012-09-14 00:02:22 +08:00