Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Browse Source

Conflicts:
	app/controllers/admin/users_new_interface_controller.rb

...

This commit is contained in:

chris 2012-11-22 21:11:57 +08:00

parent 5b39d10ac6 cc7907f37a

commit cad03a70d5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available