Merge branch 'master' into feature/fix-config
This commit is contained in:
		
						commit
						697102af78
					
				| @ -1,6 +1,6 @@ | |||||||
| babel==2.3.4 | babel==2.3.4 | ||||||
| mock==2.0.0 | mock==2.0.0 | ||||||
| nose2[coverage-plugin] | nose2[coverage_plugin] | ||||||
| cov-core==1.15.0 | cov-core==1.15.0 | ||||||
| pep8==1.7.0 | pep8==1.7.0 | ||||||
| plone.testing==5.0.0 | plone.testing==5.0.0 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user