summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reaktor taskwarrior: fix path to taskwarriorlassulus2018-07-031-1/+1
* Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-032-0/+8
|\
| * Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-031-8/+17
| |\
| * | reaktor-krebs: +taskwarriorjeschli2018-07-031-0/+1
| * | Reaktor plugins: +taskwarriorjeschli2018-07-031-0/+7
* | | l websites: add some picture dumpslassulus2018-07-031-0/+16
* | | l mors: add earlyoomlassulus2018-07-031-0/+5
* | | l dcso-dev: remove rabbitmqlassulus2018-07-031-1/+0
* | | l dcso-dev: add dev to vboxuserslassulus2018-07-031-1/+1
* | | Merge remote-tracking branch 'ni/master'lassulus2018-07-011-3/+3
|\ \ \
| * | | pass: 1.7.1 -> 1.7.2tv2018-07-011-3/+3
* | | | Merge remote-tracking branch 'gum/master'lassulus2018-07-012-0/+1
|\ \ \ \
| * | | | ma secrets: uhub.sqlmakefu2018-06-281-0/+0
| * | | | ma 0data: add nsupdate-hub.nixmakefu2018-06-281-0/+1
* | | | | add buildbotSlave pubkeylassulus2018-07-011-0/+3
* | | | | Merge remote-tracking branch 'gum/master'lassulus2018-06-283-1/+104
|\| | | |
| * | | | ma hub: initmakefu2018-06-281-0/+102
| * | | | ma source: bump to latest sourcemakefu2018-06-281-1/+1
| * | | | ma git: add fenkinsmakefu2018-06-261-0/+1
* | | | | cholerab: 4031072 -> 25d7ef05lassulus2018-06-281-2/+2
* | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-06-286-68/+140
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | j bln: fix xserver servicejeschli2018-06-271-8/+17
| | |_|/ | |/| |
| * | | j: services.xserver removed from 2configjeschli2018-06-271-20/+0
| * | | j vim: +fileline ; cosmeticsjeschli2018-06-271-12/+22
| * | | j brauerei: xserverjeschli2018-06-271-21/+16
| * | | j brauerei: vagrant fixjeschli2018-06-271-2/+12
| * | | j brauerei: +vagrantjeschli2018-06-191-0/+1
| * | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-06-19199-1882/+2651
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master'jeschli2018-06-19140-926/+1349
| | |\ \ \
| | * | | | j bln: -hipchatjeschli2018-06-191-1/+0
| | * | | | j bln: +debian efi bootentryjeschli2018-06-191-1/+15
| | * | | | j bln: +dcso-vpnjeschli2018-06-191-0/+44
| * | | | | j brauerei: +evincejeschli2018-06-191-0/+1
| * | | | | j xmonad: +dmenujeschli2018-06-191-2/+5
| * | | | | j xmonad: setWMName "LG3D"jeschli2018-06-191-1/+2
| * | | | | j brauerei: +elixir +elmjeschli2018-06-191-0/+2
| * | | | | j brauerei: wpa_supplicant -> networkmanagerjeschli2018-06-191-2/+3
| * | | | | j brauerei: +virtualboxjeschli2018-06-191-0/+2
| * | | | | j bln: +vagrantjeschli2018-06-191-0/+1
* | | | | | Merge remote-tracking branch 'prism/makefu'lassulus2018-06-2812-40/+494
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | ma gum.r: remove retroshare importmakefu2018-06-251-1/+1
| * | | | | ma nextgum.r: in preparation to move nextgum -> gummakefu2018-06-246-2/+342
| * | | | | ma kexec: init dummy host for deploying kexec tarballsmakefu2018-06-242-0/+28
| * | | | | Merge branch 'master' of prism:stockholmmakefu2018-06-2433-343/+74
| |\ \ \ \ \
| * | | | | | ma source: cherry-pick forecastio and uhub/sqlitemakefu2018-06-241-1/+3
| * | | | | | onebutton.r: add mpc-bootermakefu2018-06-242-1/+31
| * | | | | | nextgum.r: initmakefu2018-06-241-0/+32
| * | | | | | ma gum.r: split sw/hw configmakefu2018-06-172-36/+58
* | | | | | | l xjails: add vglrun optionlassulus2018-06-271-2/+8
* | | | | | | l wine: add winetrickslassulus2018-06-271-0/+1