Skip to content

Commit

Permalink
Merge branch 'master' into persist-team-name
Browse files Browse the repository at this point in the history 
Conflicts:
	markup/pledge.jade
  • Loading branch information
@WillPapper
WillPapper committed May 24, 2014
2 parents 9d8c068 + dc7b2c8 commit ef82198
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ef82198

Please sign in to comment.