Matthew K. Fu JuYuan b5571dbc43 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ... Conflicts: app/controllers/admin/users_new_interface_controller.rb app/views/admin/users_new_interface/show.html.erb		2012-10-12 18:17:05 +08:00
..
assets	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-10-12 18:17:05 +08:00
controllers	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-10-12 18:17:05 +08:00
helpers	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-10-12 18:17:05 +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	new code for attribute fields and values for new member interface	2012-10-12 18:09:02 +08:00
uploaders	GPRS and CALENDAR	2012-10-09 06:42:00 +08:00
views	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-10-12 18:17:05 +08:00