Merge remote-tracking branch 'origin/trunk' into trunk

# Conflicts: # examples/react-no-babel/README.MD
RuedigerMoeller · Aug 15, 2017 · ec3ed80 · ec3ed80
2 parents b060310 + 6487af9
commit ec3ed80
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/examples/react-no-babel/README.MD b/examples/react-no-babel/README.MD
@@ -14,3 +14,5 @@ Proxy usage can be turned off (KClient).
 * run ReactAppMain with working Dir [..]/react-no-babel
 * goto localhost:8080
 * login with 'qweqwe' 'qweqwe' (or register)
+
+check [documentation](https://github.com/RuedigerMoeller/kontraktor/wiki/Kontraktor-4-React-JSX) for details