Skip to content

Commit

Permalink
Merge branch 'dnsbuilds' of github.com:ngokevin/chili into dnsbuilds
Browse files Browse the repository at this point in the history 
Conflicts:
	cyder/cydns/cname/models.py
  • Loading branch information
@murrown
murrown committed Jan 25, 2013
2 parents 1813c28 + e463ee8 commit 2744880
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2744880

Please sign in to comment.