Mercurial > hg > anonet-resdb
annotate db/dom/ano/webd3v11/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 | c57d672ba4a4 |
children |
rev | line source |
---|---|
752
c57d672ba4a4
Added domain for webdevil fork of www.d3v11.ano
d3v11 <d3v11@d3v11.ano>
parents:
diff
changeset
|
1 d3v11 |