aboutsummaryrefslogtreecommitdiff
path: root/src/rest
diff options
context:
space:
mode:
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-01-08 10:49:06 +0100
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-01-08 10:49:06 +0100
commitf2d31fb82a314dcf6819dd494ff4a11e4f871c4e (patch)
tree029043b01c23f6e780f7fd01c15d467c568664ff /src/rest
parent9f5ea1f7f809d73cbeb7ce5538550c42e978d340 (diff)
parent3f52ce03cb13118bef9a6fbe380f229e2cbec45f (diff)
downloadgnunet-f2d31fb82a314dcf6819dd494ff4a11e4f871c4e.tar.gz
gnunet-f2d31fb82a314dcf6819dd494ff4a11e4f871c4e.zip
Merge remote-tracking branch 'origin/master' into identity_oidc
Diffstat (limited to 'src/rest')
-rw-r--r--src/rest/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am
index c0feb9122..ebfb98024 100644
--- a/src/rest/Makefile.am
+++ b/src/rest/Makefile.am
@@ -26,6 +26,8 @@ lib_LTLIBRARIES = \
26libexec_PROGRAMS = \ 26libexec_PROGRAMS = \
27 gnunet-rest-server 27 gnunet-rest-server
28 28
29EXTRA_DIST = \
30 rest.conf
29 31
30gnunet_rest_server_SOURCES = \ 32gnunet_rest_server_SOURCES = \
31 gnunet-rest-server.c 33 gnunet-rest-server.c