Douwe Maan 9413d1c2e9 Merge branch 'master' into 13948-access-request-to-projects-and-groups ... # Conflicts: # app/views/layouts/nav/_project.html.haml		2016-06-14 16:23:16 +02:00
..
fixtures	Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2	2016-06-07 10:26:27 +02:00
migrate	Merge branch 'master' into 13948-access-request-to-projects-and-groups	2016-06-14 16:23:16 +02:00
schema.rb	Merge branch 'master' into 13948-access-request-to-projects-and-groups	2016-06-14 16:23:16 +02:00
seeds.rb