Commit Graph

7 Commits

Author SHA1 Message Date
jeschli
01358d3947 Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli 2018-03-20 15:37:44 +01:00
jeschli
390375cd8a j: dirty merge again 2018-03-20 15:17:36 +01:00
tv
67969d72e1 os-release: use <stockholm-version> 2018-02-28 15:15:58 +01:00
Markus Hihn
2b418e2c18 jeschli: meltdown fix 2018-01-09 11:16:43 +01:00
jeschli
63800b93ff jeschli nixpkgs: f9390d6 -> d83c808 2018-01-04 18:51:22 +01:00
Markus Hihn
98e5141a8d jeschli: +bln 2017-12-14 17:15:05 +01:00
jeschli
29f9d3b869 boom 2017-12-05 21:29:45 +00:00