merge master

2016-07-14 13:22:24 +02:00
parent 59536ab189
commit f5868a4fa2
29 changed files with 78 additions and 351 deletions
--- a/db/seeds/development.rb
+++ b/db/seeds/development.rb
@@ -22,6 +22,3 @@ Hint.create_factories

 # submissions
 FactoryGirl.create(:submission, exercise: @exercises[:fibonacci])
-
-# teams
-FactoryGirl.create(:team, internal_users: InternalUser.limit(10))