Commit Graph

2 Commits

Author SHA1 Message Date
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
chris 189fa553c5 Changes for helpers, not including all by default 2012-10-09 14:47:16 +08:00