aboutsummaryrefslogtreecommitdiff
path: root/src/social
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-17 11:53:24 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-17 11:53:24 +0100
commitc253a40bae417335fab8446f3c7182c8c5d4833f (patch)
tree0517ab35f90bf290744e5a9ddfeb75ca9547cdbe /src/social
parent273188e646ed4d91ced1dac443e976336be877b4 (diff)
parent79fb947eb8fba243ea65e19b40b65e04f8806865 (diff)
downloadgnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.tar.gz
gnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.zip
Merge branch 'master' into getopt
Diffstat (limited to 'src/social')
-rw-r--r--src/social/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/social/.gitignore b/src/social/.gitignore
index 41954615f..875aa1105 100644
--- a/src/social/.gitignore
+++ b/src/social/.gitignore
@@ -1,2 +1,3 @@
1gnunet-social 1gnunet-social
2gnunet-service-social 2gnunet-service-social
3test_social