Skip to content

Commit

Permalink
Merge remote-tracking branch 'vickeryj/master' into development
Browse files Browse the repository at this point in the history 
Conflicts:
	lib/annotate_models.rb
  • Loading branch information
@MrJoy
MrJoy committed Mar 1, 2012
2 parents 66cbd65 + a2c807b commit 22ad722
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 22ad722

Please sign in to comment.