Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee ...

Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb

2015-11-19 10:33:18 -05:00

..

fixtures

Minor refactoring in seeding

2015-10-16 11:30:26 +02:00

migrate

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

schema.rb

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

seeds.rb

init commit

2011-10-09 00:36:38 +03:00