Jeremie Panzer a42222858f Merge remote-tracking branch 'openshift/master' ...

Conflicts:
	.openshift/markers/java7
	src/main/java/.gitkeep
	src/main/resources/.gitkeep

2013-07-10 12:07:13 +02:00

..

java

Creating template

2013-07-10 06:01:18 -04:00

resources

Creating template

2013-07-10 06:01:18 -04:00

script

fix i18n generation script

2013-05-31 15:34:00 +02:00

tomee/conf

create table and columns with the right encoding (#309)

2013-07-07 20:54:50 +02:00

webapp

Merge remote-tracking branch 'openshift/master'

2013-07-10 12:07:13 +02:00