This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ... Conflicts: app/helpers/attribute_fields_helper.rb app/views/admin/infos/_form.html.erb config/locales/zh_tw.yml		2012-11-16 15:42:39 +08:00
..
assets	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-11-16 15:42:39 +08:00
controllers	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-11-16 15:42:39 +08:00
helpers	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-11-16 15:42:39 +08:00
jobs	merge	2012-10-01 21:09:09 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-11-16 15:42:39 +08:00
uploaders	Edit uploaded package	2012-10-26 11:19:57 +08:00
views	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-11-16 15:42:39 +08:00