Mike Rosseel cda82172e3 Merge branch 'Development' into issue544-api ... Conflicts: .idea/codeStyleSettings.xml		2017-07-17 09:03:15 +02:00
..
src/main	Merge branch 'Development' into issue544-api	2017-07-17 09:03:15 +02:00
pom.xml	Add bouncycastle as lib to other jar builds	2017-07-16 17:45:53 +02:00