summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doppelbock: inittv2016-04-072-0/+58
* krebs.nginx: don't abuse extraConfigtv2016-04-071-22/+18
* Merge remote-tracking branch 'gum/master'tv2016-04-0746-172/+683
|\
| * Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-04-075-4/+215
| |\
| | * Merge remote-tracking branch 'cd/master'makefu2016-04-032-1/+177
| | |\
| | * | ma 4 default: prepare backupsmakefu2016-04-031-0/+30
| | * | ma 2 mail: use mutt, not mutt-kzmakefu2016-04-031-1/+1
| | * | ma 1 omo: cleanupmakefu2016-04-031-2/+7
| * | | k 3 makefu: add senderechnermakefu2016-04-071-0/+23
| |/ /
| * | ma 2 nginx/public_html: publish homemakefu2016-04-031-0/+15
| * | ma 1 vbob: remove obsolete sourcemakefu2016-04-031-5/+0
| * | ma 2 base-gui: save more linesmakefu2016-04-031-11/+3
| * | ma 2 tp-x220: start charging at 95makefu2016-04-031-0/+1
| * | ma 1 darth: add virtualizationmakefu2016-04-031-4/+16
| * | ma 5 mycube: use new versionmakefu2016-04-031-2/+2
| * | ma 2 omo: share emumakefu2016-04-031-0/+7
| * | ma 2 fs: use list of strings for optionsmakefu2016-04-012-3/+3
| * | Merge remote-tracking branch 'prism/master'makefu2016-03-208-45/+63
| |\ \
| | * \ Merge remote-tracking branch 'cd/master'lassulus2016-03-191-2/+2
| | |\ \
| | * | | l 3 *_nginx: remove obsolete ssl optionlassulus2016-03-192-42/+2
| | * | | l 2 baseX: add mpv-poll + depslassulus2016-03-191-1/+3
| | * | | l 5: add mpv-polllassulus2016-03-192-0/+41
| | * | | l 5: add yt-nextlassulus2016-03-192-0/+14
| | * | | k 3 l: add fastpoke pubkeylassulus2016-03-191-0/+1
| * | | | k 3 ma: update to `real` tinc pubkeymakefu2016-03-191-12/+7
| * | | | ma 1 add more nginxmakefu2016-03-192-4/+9
| |/ / /
| * | | k 3 l: add lass.pgp.pubkeys.defaultlassulus2016-03-162-0/+53
| * | | Merge remote-tracking branch 'gum/master'lassulus2016-03-1614-40/+352
| |\ \ \
| | * | | ma 1 omo: fix misleading commentmakefu2016-03-161-1/+3
| | * | | ma 1 gum: allow vbob and omo usersmakefu2016-03-161-0/+6
| | * | | ma 1 darth: configure aux diskmakefu2016-03-161-3/+25
| | * | | ma 2 default: really do use tinc_premakefu2016-03-161-0/+1
| | * | | k 3 ma: expose pgp pubkeysmakefu2016-03-161-3/+5
| | * | | Merge remote-tracking branch 'cd/master'makefu2016-03-167-27/+175
| | |\ \ \
| | * \ \ \ Merge branch 'master' of gum:stockholmmakefu2016-03-161-6/+23
| | |\ \ \ \
| | * | | | | k 3 ma: add default and brainmakefu2016-03-162-0/+115
| * | | | | | l 2 vim: add file-line pluginlassulus2016-03-151-3/+13
| * | | | | | l 2 baseX: add xbacklightlassulus2016-03-151-0/+1
| * | | | | | l 3 newsbot-js -> k 3 newsbot-jslassulus2016-03-154-7/+4
| * | | | | | l 2 base: activate timesyncdlassulus2016-03-151-1/+2
| * | | | | | k 5 newsbot-js: bump rev 802b172 -> 09e0163lassulus2016-03-151-3/+3
| * | | | | | l 5 newsbot-js -> k 5 newsbot-jslassulus2016-03-153-1/+0
| * | | | | | Merge remote-tracking branch 'gum/master'lassulus2016-03-1516-96/+328
| |\| | | | |
| * | | | | | Merge remote-tracking branch 'cd/master'lassulus2016-03-158-35/+89
| |\ \ \ \ \ \
| * | | | | | | l 1 mors: add acronym to pkgslassulus2016-03-151-0/+1
| * | | | | | | l 5: add acronymlassulus2016-03-152-0/+14
| * | | | | | | l 1 mors: activate postgresqllassulus2016-03-151-0/+6
| * | | | | | | l 2 retiolum: use tinc_prelassulus2016-03-151-0/+4
| * | | | | | | l 2 base: MANPAGER=most PAGER=lesslassulus2016-03-152-5/+1
| * | | | | | | k 3 l: add .r alias to echelonlassulus2016-03-151-0/+1