Permalink
Browse files

Merge branch 'master' of github.com:giacomomacri/whenever

Conflicts:
	lib/whenever/capistrano.rb
  • Loading branch information...
giacomomacri
giacomomacri committed Feb 15, 2012
2 parents 4730fff + 1b8cf47 commit 941229c1f598acf207ea3c9a1241e1f88c09680a
Showing with 0 additions and 0 deletions.

0 comments on commit 941229c

Please sign in to comment.