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

..

default_favicon.gif

bypass our server directly for feed favicons

2013-04-28 15:15:59 +02:00

google_reader_icon.png

styling

2013-04-06 19:04:51 +02:00

jbosscorp_logo.png

Creating template

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

logo_2.png

some welcome page styling

2013-05-16 19:11:05 +02:00

logo.png

some welcome page styling

2013-05-16 19:11:05 +02:00

preview.jpg

some welcome page styling

2013-05-16 19:11:05 +02:00