Skip to content

Commit

Permalink
Merge branch 'master' of github.com:GregMefford/redmine
Browse files Browse the repository at this point in the history 
Conflicts:
	app/models/user.rb
	test/unit/user_test.rb
  • Loading branch information
Greg Mefford committed Nov 13, 2010
2 parents eaab2ed + 022c8ad commit b817513
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b817513

Please sign in to comment.