Merge pull request #483 from dhalbert/2.x

bring CPX frozen modules up to date
This commit is contained in:
Kattni 2017-12-14 18:38:05 -05:00 committed by GitHub
commit 6d603e462d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 8a7d9d99d2157376679735130b97bf236ccf755f Subproject commit 278bef35321443319cb02dfe4bb8014b21974c8d

@ -1 +1 @@
Subproject commit cafc445f080736beefb1694ae79359a3be0c7bbb Subproject commit fe8eb66b0870d8bd30d5de87f36b3cccb56b2f08