Alex Theedom 8c879fc287 Merge remote-tracking branch 'origin/master' ... # Conflicts: # ejb/ejb-client/pom.xml # ejb/ejb-remote/pom.xml # ejb/pom.xml		2017-01-04 22:44:11 +01:00
..
src	Merge remote-tracking branch 'origin/master'	2017-01-04 22:44:11 +01:00
pom.xml	Add deploy profiles for standalone wildfly using cargo plugin and for runtime installed instance	2017-01-04 22:42:19 +01:00