summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* jeschli git: fix irc-announce calltv2018-09-071-3/+5
* Merge remote-tracking branch 'prism/master'tv2018-09-0670-482/+1170
|\
| * Merge remote-tracking branch 'gum/master'lassulus2018-09-0454-323/+957
| |\
| | * wolf.r: add mobile mpd web frontendsmakefu2018-09-032-1/+34
| | * ma rompr: init (but will never use it)makefu2018-09-021-0/+76
| | * ma pkgs.cozy-audiobooks: use pythonPackages instead of variablesmakefu2018-09-011-3/+2
| | * ma vim: move to editormakefu2018-08-302-104/+99
| | * ma pkgs.bento4: init at 1.5.1-624makefu2018-08-302-0/+30
| | * ma pkgs.cozy-audiobooks: init at 0.6.0makefu2018-08-291-0/+100
| | * ma 1system: ip4 -> ipv4.addressesmakefu2018-08-295-6/+6
| | * retiolum-bootstrap: forceSSLmakefu2018-08-291-4/+1
| | * ma krops.nix: initmakefu2018-08-2926-21/+136
| | * Merge remote-tracking branch 'lass/master'makefu2018-08-2835-381/+255
| | |\
| | * | ma events-publisher: bumpmakefu2018-08-241-2/+2
| | * | ma hw/smartcard: initmakefu2018-08-171-0/+18
| | * | ma pkgs.ifdnfc: init at 2016-03-01makefu2018-08-171-0/+45
| | * | gitlab-ci: clean up ssh key after deploymakefu2018-08-171-0/+2
| | * | ma nur.nix: remove modules part (for now)makefu2018-08-171-1/+0
| | * | gitlab-ci.yml: add deployment to nur-packages for makefumakefu2018-08-171-0/+12
| | * | ma pkgs.beef: bump version, fix packagemakefu2018-08-165-108/+348
| | * | ma nur.nix: don't export customized configmakefu2018-08-161-1/+0
| | * | ma extra-gui: rm arduino-envmakefu2018-08-161-1/+0
| | * | ma pkgs.drozer: fix buildmakefu2018-08-161-4/+5
| | * | ma pkgs.arduino-user-env,pkqgen-ger: ripmakefu2018-08-161-35/+0
| | * | ma pkgs/default: remove stockholm dependencymakefu2018-08-161-5/+5
| | * | ma pkgs/nur.nix: initmakefu2018-08-161-0/+9
| * | | Merge remote-tracking branch 'ni/master'lassulus2018-09-045-11/+39
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-09-041-0/+73
| |\ \ \ \
| | * | | | j: +gitjeschli2018-09-041-0/+73
| * | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-09-045-1/+16
| |\| | | |
| | * | | | j steam: remove dead codejeschli2018-09-041-10/+0
| | * | | | j enklave: +cgitjeschli2018-09-043-1/+3
| | * | | | Merge remote-tracking branch 'origin/master'jeschli2018-08-2151-413/+500
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-08-212-1/+7
| | |\ \ \ \ \
| | * | | | | | j brauerei: +steamjeschli2018-08-212-0/+23
| * | | | | | | l: rekey, rename borg.r -> rock.r (Mic92)lassulus2018-09-021-16/+15
| * | | | | | | nixpkgs: 4df3426 -> a37638dlassulus2018-09-011-3/+3
| * | | | | | | add dummy_secret for konsenslassulus2018-08-291-0/+0
| * | | | | | | buildbot-standalone: check cgit.hotdog.rlassulus2018-08-291-1/+1
| * | | | | | | repo-sync: add konsens for krops & stockholmlassulus2018-08-291-1/+25
| * | | | | | | add konsens modulelassulus2018-08-292-0/+81
| * | | | | | | l: rip dishfire.rlassulus2018-08-294-138/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | repo-sync: announce tagstv2018-09-061-0/+1
* | | | | | | irc-announce: whitelist refs instead of branchestv2018-09-064-19/+27
* | | | | | | repo-sync: announcemnastertv2018-09-061-1/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge remote-tracking branch 'prism/master'tv2018-08-2967-497/+666
|\| | | | |
| * | | | | repo-sync: remove staging branches, stylelassulus2018-08-251-22/+7
| * | | | | hotdog.r: repo-sync all the reposlassulus2018-08-242-26/+122
| * | | | | l: add some mailslassulus2018-08-231-0/+2
| * | | | | l prism.r: add palos pubkeyslassulus2018-08-231-0/+2