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
..
devise.en.yml	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
devise.zh_tw.yml	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
en.yml	GPRS and CALENDAR	2012-10-09 06:42:00 +08:00
rails.yml	Add asset model and controller	2010-02-01 17:24:28 +08:00
social_share_button.en.yml	first version of fb_share	2012-08-08 11:04:19 +08:00
social_share_button.zh-tw.yml	first version of fb_share	2012-08-08 11:04:19 +08:00
zh_tw.yml	new code for attribute fields and values for new member interface	2012-10-12 18:09:02 +08:00