Skip to content
Snippets Groups Projects
Commit 2e306402 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-newcontent1_0' 

redisabled incubator fathers as childgen still can't handle it

See merge request !2996
parents 95998ab4 b9deb4e6
Branches
Tags
2 merge requests!3002Pregmod v1032 initial merge,!2996redisabled incubator fathers as childgen still can't handle it
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment