devin a99d685bce conflict solved

2012-04-28 01:56:00 +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

conflict solved

2012-04-28 01:56:00 +08:00