Skip to content

Commit

Permalink
Merge branch 'master' into issue-566-vagrant-windows
Browse files Browse the repository at this point in the history 
Conflicts:
	cookbooks/pybossa/recipes/default.rb
  • Loading branch information
@teleyinex
teleyinex committed Aug 1, 2013
2 parents 121a4dd + 11f11bc commit 20d9b0c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 20d9b0c

Please sign in to comment.