Mercurial > hg > anonet-resdb
annotate db/ip/01/00/1A/owner @ 1119:5645d1ed79c5 draft
There was some werid stuff with add_dom went with what looked like the best
of the conflicting lines.
Merge branch 'master' of git://1.4.7.7/resdb
Conflicts:
scripts/add_dom
author | epoch <epoch@hacking.allowed.org> |
---|---|
date | Fri, 24 May 2013 02:39:47 +0000 |
parents | e8465a131091 |
children |
rev | line source |
---|---|
272
e8465a131091
Added nomius cidr, as and domain (turtleisland.ano)
root <root@Aquiles.(none)>
parents:
diff
changeset
|
1 nomius |