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

Browse Source

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_side_bar.html.erb

...

This commit is contained in:

Christophe Vilayphiou 2012-09-14 00:03:52 +08:00

parent df6c7afd68 669220530d

commit 03b5827392

1 changed files with 1 additions and 1 deletions

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