Skip to content
This repository has been archived by the owner on May 22, 2019. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/twitter/gizzard into bird…
Browse files Browse the repository at this point in the history 
…cage

Conflicts:
	project/build.properties
	project/build/GizzardProject.scala
	project/release.properties
  • Loading branch information
Sumeet Lahorani committed Apr 13, 2012
2 parents 0c721c2 + 78e78be commit c4ff052
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit c4ff052

Please sign in to comment.