Merge pull request oasp#464 from sroeger/markdownToAdoc

oasp#460 Markdown to adoc
mmatczak · Aug 9, 2016 · d85dbd0 · d85dbd0
2 parents 8f461e7 + 5aaa0e3
commit d85dbd0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
@@ -0,0 +1,9 @@
+= CONTRIBUTING
+
+To create or resove issues or to contribute code or documentation, please visit the following WIKI pages:
+
+* for  https://github.com/oasp-forge/oasp4j-wiki/wiki/oasp-issue-work[Issue creation and resolution]
+* for  https://github.com/oasp-forge/oasp4j-wiki/wiki/oasp-code-contributions[Contributions of code]
+* for  https://github.com/oasp-forge/oasp4j-wiki/wiki/oasp-documentation[Contributions to documentation]
+
+Thanks for your contribution!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.adoc b/README.adoc
@@ -0,0 +1,7 @@
+= The Open Application Standard Platform for Java
+
+*Build status*
+
+stable: image:https://travis-ci.org/oasp/oasp4j.svg?branch=master["Build Status",link="https://travis-ci.org/oasp/oasp4j"]
+
+snapshot: image:https://travis-ci.org/oasp/oasp4j.svg?branch=develop["Build Status",link="https://travis-ci.org/oasp/oasp4j"]
diff --git a/README.md b/README.md