summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2013-02-18 12:22:04 -0800
committerJeff McCune <jeff@puppetlabs.com>2013-02-18 12:22:04 -0800
commitd2e0c53243060a158e2fde18d8b05718397e0ded (patch)
tree0e63aa32b5afff6333ec81cc340bd5ec7ad51d9b /LICENSE
parentd7aea0f0be659223452ba2d65e799d2b7dbfd823 (diff)
parent1e2ee5bd01b85258548bb7c0aabe4ce0938b2560 (diff)
Merge branch '2.x' into 3.x
* 2.x: changed .count to .size to support legacy ruby
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions