Compare commits
					merge into: Drift:gitea-vaskepersonalet
					
				
				
						
							Drift:main
						
							Drift:gitea-vaskepersonalet
						
							Drift:errorpages
						
							Drift:create-flake-input-exporter
						
							Drift:minecraft-heatmap
						
							Drift:fix-import-gitea-users-script
						
							Drift:gitea-runners-secrets
						
							Drift:gitea-runners-cluster
						
							Drift:25.05
						
							Drift:new_nodes
						
							Drift:ooye
						
							Drift:grg-ip
						
							Drift:nom
						
							Drift:add-skrott
						
							Drift:pvvvvv
						
							Drift:setup-git-mirroring-on-bicep
						
							Drift:init-bakke
						
							Drift:gitea-show-license-in-list-view
						
							Drift:nix-topology
						
							Drift:gitea-robots-txt
						
							Drift:dagali-heimdal-openldap-sasl-stack
						
							Drift:gitea-navbar-get-started
						
							Drift:backup-databases
						
							Drift:openwebui
						
							Drift:setup-openvpn-tunnel
						
							Drift:gitea-gpg-signing
						
							Drift:sleipner-authorised-keys
						
							Drift:openstack-image-builder
						
							Drift:elysium
						
							Drift:smartd-notifs
						
							Drift:systemd-journald-remote
						
							Drift:skrot
						
							Drift:deploy-doorbell
						
							Drift:misc-gitea-fixes
						
							Drift:spotifyd
						
							Drift:remote
						
							Drift:setup-bikkje-login
						
							Drift:ozai-prod
						
							Drift:add-bluemap
						
							Drift:ozai
						
							Drift:setup-postfix-for-service-machines
						
							Drift:fix-gitea-ci-runner-network-issues
						
							Drift:heimdal-openldap-sasl-testing-on-salsa-on-buskerud
						
							Drift:gitea-metrics
						
							Drift:misc1
						
							Drift:add-simple-saml-theme
						
							Drift:misc-extra-gitea-setup
						
							Drift:setup-kerberos
						
							Drift:setup-home-areas
						
							Drift:shark-kanidm
						
							Drift:prometheusexim
						
						
							
								jonmro:main
							
								jonmro:upgrade-to-nixpkgs-23-11
							
								jonmro:mediawiki-on-bekkalokk
							
								jonmro:setup-kerberos
							
								jonmro:setup-home-areas
							
								jonmro:richara-add-user
							
								jonmro:replace-knakelibrak-nginx-reverse-proxy
							
								jonmro:replace-knakelibrak-nginx-reverse-proxy2
							
								jonmro:nettsiden-on-bekkalokk
							
								jonmro:setup-openvpn-tunnel
							
								jonmro:actions
							
								jonmro:configure-mediawiki
							
								jonmro:shark-kanidm
							
								jonmro:add-jackson
							
								jonmro:add-gitea
							
								jonmro:prometheusexim
							
								jonmro:apply-overlays
							
						
						
						
					
					...
			
					pull from: jonmro:main
					
				
				
						
							jonmro:main
						
							jonmro:upgrade-to-nixpkgs-23-11
						
							jonmro:mediawiki-on-bekkalokk
						
							jonmro:setup-kerberos
						
							jonmro:setup-home-areas
						
							jonmro:richara-add-user
						
							jonmro:replace-knakelibrak-nginx-reverse-proxy
						
							jonmro:replace-knakelibrak-nginx-reverse-proxy2
						
							jonmro:nettsiden-on-bekkalokk
						
							jonmro:setup-openvpn-tunnel
						
							jonmro:actions
						
							jonmro:configure-mediawiki
						
							jonmro:shark-kanidm
						
							jonmro:add-jackson
						
							jonmro:add-gitea
						
							jonmro:prometheusexim
						
							jonmro:apply-overlays
						
						
							
								Drift:main
							
								Drift:gitea-vaskepersonalet
							
								Drift:errorpages
							
								Drift:create-flake-input-exporter
							
								Drift:minecraft-heatmap
							
								Drift:fix-import-gitea-users-script
							
								Drift:gitea-runners-secrets
							
								Drift:gitea-runners-cluster
							
								Drift:25.05
							
								Drift:new_nodes
							
								Drift:ooye
							
								Drift:grg-ip
							
								Drift:nom
							
								Drift:add-skrott
							
								Drift:pvvvvv
							
								Drift:setup-git-mirroring-on-bicep
							
								Drift:init-bakke
							
								Drift:gitea-show-license-in-list-view
							
								Drift:nix-topology
							
								Drift:gitea-robots-txt
							
								Drift:dagali-heimdal-openldap-sasl-stack
							
								Drift:gitea-navbar-get-started
							
								Drift:backup-databases
							
								Drift:openwebui
							
								Drift:setup-openvpn-tunnel
							
								Drift:gitea-gpg-signing
							
								Drift:sleipner-authorised-keys
							
								Drift:openstack-image-builder
							
								Drift:elysium
							
								Drift:smartd-notifs
							
								Drift:systemd-journald-remote
							
								Drift:skrot
							
								Drift:deploy-doorbell
							
								Drift:misc-gitea-fixes
							
								Drift:spotifyd
							
								Drift:remote
							
								Drift:setup-bikkje-login
							
								Drift:ozai-prod
							
								Drift:add-bluemap
							
								Drift:ozai
							
								Drift:setup-postfix-for-service-machines
							
								Drift:fix-gitea-ci-runner-network-issues
							
								Drift:heimdal-openldap-sasl-testing-on-salsa-on-buskerud
							
								Drift:gitea-metrics
							
								Drift:misc1
							
								Drift:add-simple-saml-theme
							
								Drift:misc-extra-gitea-setup
							
								Drift:setup-kerberos
							
								Drift:setup-home-areas
							
								Drift:shark-kanidm
							
								Drift:prometheusexim
							
						
						
						
					
					These branches are equal.