Paul Campbell df9926c428 Merge branch 'master' into develop ... * master: travis--ci: update key to match passphrase travis--ci: batch import signing key travis-ci: replace signing key to match passphrase .travis.yml: CI_DEPLOY_GPG_PASSPHRASE (4/4) .travis.yml: CI_DEPLOY_GPG_KEYNAME (3/4) .travis.yml: CI_DEPLOY_PASSWORD (2/4) .travis.yml: replace encrypted data (1/4) travis-ci: update location of travis-settings.xml travis-ci: use a shell-safe password travis-ci: make shell scripts executable (again) travis-ci: remove comments travis-ci: updated and add encrypted gpg credentials pom.xml: version set to 2.1.2		2017-05-28 18:06:02 +01:00
..
src	KCR22: builder: sort rules alphabetically	2017-05-27 14:04:19 +01:00
pom.xml	Merge branch 'master' into develop	2017-05-28 18:06:02 +01:00