Merge remote-tracking branch 'origin/master'

[git.ikiwiki.info.git] / doc / spam_fighting.mdwn

diff --git a/doc/spam_fighting.mdwn b/doc/spam_fighting.mdwn
index 6e04dcf8f40ee4a060cefbce7ab7ce4f591ae580..32ba4b45936c35766f9750c0063cbd2cc616bc71 100644 (file)
--- a/doc/spam_fighting.mdwn
+++ b/doc/spam_fighting.mdwn
@@ -30,4 +30,11 @@ cba01c2 | 2013/09/15 | spain1001 | 80.187.106.136
 702a3e5 | 2014/01/02 | Toni      | 124.105.173.121
 c2924ce | 2014/01/02 | domtheo9110 | 182.253.51.174
 cd81b9f | 2014/01/03 | domtheo9110 | ?
 702a3e5 | 2014/01/02 | Toni      | 124.105.173.121
 c2924ce | 2014/01/02 | domtheo9110 | 182.253.51.174
 cd81b9f | 2014/01/03 | domtheo9110 | ?

+e3376ce | 2014/08/19 | Nng_L (OpenID) | 58.186.127.104
+104c606 | 2014/08/19 | tlevine (OpenID) | 82.153.13.48
+4c7f247 and 4 more | 2015/01/08 | lis (OpenID) | 122.173.219.54
+eb526e9 and 5 more | 2015/01/10 | loveneet (OpenID) | 122.173.133.14
+ca4d8fc and 17 more | 2015/01/12-14 | spalax. (note the trailing dot) | 122.173.227.51 and 122.173.17.141
+992f995 | 2015/03/20 | snape (OpenID) | 187.209.217.54
+1d05cf3 | 2015/05/20 | justine (OpenID) | ?

 """]]
 """]]