diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
| commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
| tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /gnu/services/shepherd.scm | |
| parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
| parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
| download | guix-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz guix-9dea3f101f252331c049c03f501398a5ec837ba9.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to 'gnu/services/shepherd.scm')
0 files changed, 0 insertions, 0 deletions