Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

2012-06-29 16:10:29 +08:00

..

attribute_field.rb

Embedded to referenced for users

2012-01-24 15:12:06 +08:00

attribute_value.rb

Users can now be saved with sub_roles

2011-12-20 14:35:28 +08:00

attribute.rb

Embedded to referenced for users

2012-01-24 15:12:06 +08:00

info.rb

Change role structure

2011-12-10 18:12:39 +08:00

role.rb

Embedded to referenced for users

2012-01-24 15:12:06 +08:00

sub_role.rb

Embedded to referenced for users

2012-01-24 15:12:06 +08:00

user.rb

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

2012-06-29 16:10:29 +08:00