Merge remote-tracking branch 'openshift/master'

Browse Source

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

...

This commit is contained in:

Jeremie Panzer

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

parent 430cc9b039 e5f9c9d617

commit a42222858f

5 changed files with 469 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

src/main/webapp/images/jbosscorp_logo.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB