Skip to content

Commit

Permalink
Merge branch 'development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
sakshee-19 authored Oct 9, 2018
2 parents de67ea1 + 01474bc commit 7cff0c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/misc/architecture.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The `loklak` Architecture

loklak is a java application which runs a jetty web server for the html interface and an Elasticsearch search server. The application contains a self-documentation which consists of the web pages you are looking at right now. There is also a [javadoc](javadoc.html).
loklak is a java application which runs a jetty web server for the html interface and an Elasticsearch search server. The application contains a self-documentation which consists of the web pages you are looking at right now.

- [File System Structure](#the-file-system-structure)
- [Application Sockets and Ports](#application-sockets-and-ports)
Expand Down

0 comments on commit 7cff0c7

Please sign in to comment.