summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tv'lassulus2015-08-246-13/+16
|\
| * tv git: allow secret collaborateurstv2015-08-241-6/+6
| * tv urlwatch: +eximtv2015-08-201-0/+2
| * {cd,nomic,wu} nixpkgs: -> 03130ec [4z3]tv2015-08-203-6/+6
| * nomic nixpkgs: 9d5508d -> 1357692tv2015-08-201-1/+1
| * krebs types net.addrs: s/apply/default/tv2015-08-201-1/+2
* | Merge branch 'makefu'lassulus2015-08-2315-54/+244
|\ \
| * | makefu:add wwan configuration for netzclubmakefu2015-08-231-0/+17
| * | makefu/cgit: change stockholm descriptionmakefu2015-08-231-1/+1
| * | Merge branch 'master' of pnp:stockholmmakefu2015-08-231-0/+10
| |\ \
| | * | makefu: add wwan with wvdialFelix Richter2015-08-231-0/+10
| * | | makefu: add button-3 scrolling to x220 configmakefu2015-08-232-4/+6
| |/ /
| * | makefu: cleanup,refactoring after transfermakefu2015-08-239-53/+100
| * | add pornocauster systemsSystem administrator2015-08-222-0/+78
| * | makefu:add urlwatch,exim-retiolumFelix Richter2015-08-173-3/+33
| * | makefu/pnp: add urlwatchFelix Richter2015-08-171-4/+11
| * | urlwatch: fix ca-bundle pathFelix Richter2015-08-171-2/+1
| |/
* | lass 2: add bitlbeelassulus2015-08-232-1/+17
* | lass: add bitlbee-steam supportlassulus2015-08-235-0/+288
* | lass 2 base: disable ntplassulus2015-08-221-0/+3
* | Zhosts: specify ports in new formatlassulus2015-08-203-2/+4
* | krebs 3: fix uriel's emaillassulus2015-08-201-1/+1
* | Zhosts: add Port 53 to gum & flaplassulus2015-08-202-0/+2
* | krebs 3: make uriel securelassulus2015-08-191-0/+1
* | krebs 5 youtube-tools: bump revlassulus2015-08-171-2/+2
* | lass 1: bump revlassulus2015-08-172-2/+2
* | krebs 5: add youtube-toolslassulus2015-08-172-0/+22
* | Merge branch 'makefu'lassulus2015-08-174-50/+126
|\|
| * services: add new mailFelix Richter2015-08-171-1/+1
| * krebs/zones: # is not a comment in dns zones ...Felix Richter2015-08-171-1/+2
| * makefu:add disable_v6Felix Richter2015-08-171-0/+4
| * makefu:add ramverdopplerFelix Richter2015-08-161-0/+3
| * makefu: add allow-discardsFelix Richter2015-08-161-1/+3
| * add implementation of /etc/zones/Felix Richter2015-08-161-48/+114
* | lass 2 base: (re)enable maillassulus2015-08-171-0/+1
* | lass 2 base: reject on retiolumlassulus2015-08-171-0/+1
* | 1 lass mors: disable old powertop tuneablelassulus2015-08-171-1/+1
* | 1 lass mors: bump revlassulus2015-08-171-1/+1
|/
* Merge remote-tracking branch 'cloudkrebs/master'Felix Richter2015-08-162-3/+0
|\
| * lass 2 retiolum: remove obsolete importlassulus2015-08-161-1/+0
| * lass 2 base: remove nmaplassulus2015-08-161-2/+0
* | Merge branch 'before-merge'Felix Richter2015-08-163-3/+16
|\ \ | |/ |/|
| * makefu/x200: add thinkfan and tlpmakefu2015-08-131-1/+7
| * makefu:update basemakefu2015-08-131-2/+4
| * add redshiftmakefu2015-08-131-0/+5
| * Merge remote-tracking branch 'cd/master' into before-mergemakefu2015-08-131-91/+91
| |\
* | | add posix-array packageFelix Richter2015-08-162-0/+32
* | | makefu: add rad1o.nixmakefu2015-08-141-1/+4
* | | Merge remote-tracking branch 'cd/master'makefu2015-08-1415-584/+643
|\ \ \
| * \ \ Merge remote-tracking branch 'mors/master'tv2015-08-142-12/+11
| |\ \ \