summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ni/master'lassulus2017-04-131-2/+2
|\
| * htgen: 1.1 -> 1.2tv2017-04-131-2/+2
* | l 1 prism: update chat authorized_keylassulus2017-04-131-1/+1
* | l 1 prism: add Reaktor for #retiolumlassulus2017-04-131-0/+12
* | l 1 prism: change nickname for #coders Reaktorlassulus2017-04-131-8/+9
* | Merge remote-tracking branch 'ni/master'lassulus2017-04-132-2/+1
|\|
| * lass news: -wired_scitv2017-04-131-1/+0
| * tv nixpkgs: 33bd699 -> 7ad99e9tv2017-04-131-1/+1
| * Merge remote-tracking branch 'gum/master'tv2017-04-131-1/+1
| |\
* | \ Merge remote-tracking branch 'gum/master'lassulus2017-04-131-1/+1
|\ \ \ | |/ / |/| / | |/
| * m 1 wry: do not provide bepastymakefu2017-04-121-1/+1
* | Merge remote-tracking branch 'prism/lassulus'tv2017-04-135-2/+22
|\|
| * l 2: change search-domain to .rlassulus2017-04-121-1/+1
| * l 2 buildbot: change buildbotURL to build.prism.rlassulus2017-04-121-2/+10
| * k 3 l: add build.prism.r aliaslassulus2017-04-121-0/+1
| * l 5 logify: initlassulus2017-04-122-0/+8
| * l 2 buildbot: use prism.rlassulus2017-04-121-0/+3
* | types.net: normalize IPv6 addresstv2017-04-131-0/+1
* | lib: add normalize-ip6-addrtv2017-04-131-0/+46
* | tv: normalize all ip6.addrtv2017-04-131-11/+11
* | krebs.search-domain: retiolum -> rtv2017-04-131-1/+1
* | tv nixpkgs: 69d9061 -> 33bd699tv2017-04-121-1/+1
|/
* mv: drop .retiolumtv2017-04-121-2/+0
* tv charybdis: irc.retiolum -> irc.rtv2017-04-121-1/+1
* tv nginx public_html: drop .retiolumtv2017-04-121-1/+0
* shared collectd-base: .retiolum -> .rtv2017-04-121-1/+1
* krebs.urlwatch: .retiolum -> .rtv2017-04-121-1/+1
* shared: .retiolum -> .rtv2017-04-121-2/+2
* krebs.exim-* relay_to_domains: drop .retiolum from defaulttv2017-04-122-4/+2
* krebs.git.cgit: drop support for .retiolumtv2017-04-121-1/+0
* tv: drop .retiolumtv2017-04-121-14/+0
*-. Merge remote-tracking branches 'prism/master' and 'gum/master'tv2017-04-1220-122/+135
|\ \
| | * m: .retiolum -> .rmakefu2017-04-122-39/+29
| | * k 3 m: mv pgp keysmakefu2017-04-123-2/+2
| * | lass: .retiolum -> .rlassulus2017-04-123-26/+12
| * | Merge remote-tracking branch 'gum/master'lassulus2017-04-118-43/+57
| |\|
| * | l 2 paste: set client_max_body_size to 4Glassulus2017-04-111-0/+1
| * | l 2 repo-sync: sync Reaktorlassulus2017-04-111-0/+1
| * | l 2: add kpaste to pkgslassulus2017-04-111-0/+1
| * | k 5 kpaste: initlassulus2017-04-111-0/+5
| * | l 1 prism: import paste.nixlassulus2017-04-111-0/+1
| * | k 3 l: new prism alias: p.rlassulus2017-04-111-0/+1
| * | l 2: add paste.nixlassulus2017-04-111-0/+26
| * | l 2 websites domsen: add testuser@ubikmedia.eulassulus2017-04-111-0/+1
| * | l 2 hw tp-x220: disable vertEdgeScrolllassulus2017-04-111-0/+1
| * | Revert "l 2: use alternate dnscrypt resolver"lassulus2017-04-111-4/+1
| * | l 1 prism: update JuiceSSH pubkeylassulus2017-04-111-1/+1
| * | Merge remote-tracking branch 'ni/master'lassulus2017-04-112-3/+3
| |\ \
| * | | l 2 nixpkgs: ade5837 -> a563923lassulus2017-04-111-1/+1
| * | | Merge remote-tracking branch 'prism/newest'lassulus2017-04-029-78/+17
| |\ \ \