Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/suubersnake/Projects
Browse files Browse the repository at this point in the history 
Conflicts:
	Classes/FamilyTree/person.py
	Classes/Matrix.py
  • Loading branch information
@jacobsky
jacobsky committed Mar 21, 2014
2 parents 4a0abbf + 599002a commit 65424b6
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 65424b6

Please sign in to comment.