merged wiki page changes

2013-11-18 17:34:03 +00:00
parent a0665313ed 373e13208f
commit d15da0ffd4
15 changed files with 146 additions and 54 deletions
--- a/doc/wiki/Tasks-Roadmap.md
+++ b/doc/wiki/Tasks-Roadmap.md
@@ -1,3 +1,4 @@
+Check new roadmap wiki page: [roadmap](./roadmap)
 ## Future
 * Focus on REST API
    - Hypermedia API
@@ -31,5 +32,5 @@
 * Installation scripts

 ## Contributors ##
-  - See [[the collaboration page|Community-collaboration]] 
+  - See [the collaboration page](./Community-collaboration)