Tobias Geerinckx-Rice 9dea3f101f 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		2021-06-23 18:45:21 +02:00
..
java.scm	guix: java-utils: Add Maven-related phases.	2020-07-17 04:10:28 +02:00
plugin.scm	guix: java-utils: Add Maven-related phases.	2020-07-17 04:10:28 +02:00
pom.scm	Merge branch 'master' into core-updates	2021-06-23 18:45:21 +02:00