Skip to content

Commit

Permalink
Merge branch 'pr/2007'
Browse files Browse the repository at this point in the history
Conflicts:
	licenses/cla-individual.md
  • Loading branch information
Jermolene committed Oct 24, 2015
2 parents 7040d48 + ed1a306 commit 0996f06
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions licenses/cla-individual.md
Expand Up @@ -254,3 +254,5 @@ Karl Knechtel, @zahlman, 2015/10/03
Tony Grosinger @tgrosinger 2015/10/03

Antaeus Feldspar @afeldspar 2015/10/20

Soeren Enevoldsen, @senevoldsen90, 2015/10/09

0 comments on commit 0996f06

Please sign in to comment.