aboutsummaryrefslogtreecommitdiff
path: root/src/auction
diff options
context:
space:
mode:
authorMarkus Teich <teichm@fs.tum.de>2017-01-12 17:34:19 +0100
committerMarkus Teich <teichm@fs.tum.de>2017-01-12 17:34:19 +0100
commita707b68b7513df183860c2a6adfbae4995fb68fd (patch)
treea573fdcf2e778a5d961cc62382c2e47d6627d7b3 /src/auction
parent84dc6a3184d951d6b5f49e3075022a6e5895b716 (diff)
parentcf287b4aeb5658ce1147e47ae189a23fd87bce1d (diff)
downloadgnunet-a707b68b7513df183860c2a6adfbae4995fb68fd.tar.gz
gnunet-a707b68b7513df183860c2a6adfbae4995fb68fd.zip
Merge branch 'master' into auction
Diffstat (limited to 'src/auction')
-rw-r--r--src/auction/auction.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/auction/auction.conf b/src/auction/auction.conf
new file mode 100644
index 000000000..139597f9c
--- /dev/null
+++ b/src/auction/auction.conf
@@ -0,0 +1,2 @@
1
2