Permalink
Browse files

Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
  • Loading branch information...
2 parents cd7aaed + 2a7930a commit e9f5de7e8c1d97f1e831823bbfcdac0bd7b81033 @graemerocher graemerocher committed Feb 19, 2013
Showing with 0 additions and 0 deletions.

0 comments on commit e9f5de7

Please sign in to comment.