Skip to content

Commit

Permalink
Merge branch 'master' into pharo1.3
Browse files Browse the repository at this point in the history 
Conflicts:
	repository/MonticelloFileTree-Core.package/monticello.meta/version
	repository/MonticelloFileTree-Tests.package/monticello.meta/version
  • Loading branch information
Dale Henrichs committed Jul 30, 2012
2 parents e0fc463 + beca7a2 commit 8353c12
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.

0 comments on commit 8353c12

Please sign in to comment.