Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tyrbo committed Jul 31, 2014
2 parents 10e5a6b + db7d146 commit 930f78a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions 1406/04_clone_wars/clone_wars_submissions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ submissions:
instructor_evaluation:
notes: ""
rubric:
Functional Expectations: 0
Test-Driven Development: 0
Encapsulation / Components: 0
Fundamental Ruby & Style: 0
Sinatra / Web and Business Logic: 0
View Layer: 0
Functional Expectations: 3
Test-Driven Development: 2.5
Encapsulation / Components: 3
Fundamental Ruby & Style: 3
Sinatra / Web and Business Logic: 3
View Layer: 3
peer_evaluation:
notes: ""
rubric:
Expand Down

0 comments on commit 930f78a

Please sign in to comment.