Skip to content
Commit 2068eac8 authored by anarcat's avatar anarcat
Browse files

Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/repository.pp
parents 177350aa 5a7f2111
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment