garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

3
.openshift/action_hooks/README.md Normal file
View File

@@ -0,0 +1,3 @@
For information about which action hooks are supported, consult the OpenShift documentation:
https://github.com/openshift/origin-server/blob/master/node/README.writing_applications.md