merge master

2016-07-14 13:22:24 +02:00
parent 59536ab189
commit f5868a4fa2
29 changed files with 78 additions and 351 deletions
--- a/spec/factories/team.rb
+++ b/spec/factories/team.rb
@@ -1,6 +0,0 @@
-FactoryGirl.define do
-  factory :team do
-    internal_users { build_pair :teacher }
-    name 'The A-Team'
-  end
-end