main#33

Po-rygon wants to merge 7 commits intoCompVis:masterCompVis/taming-transformers:masterfrom

leevisin:leevisin-branchleevisin/taming-transformers:leevisin-branchCopy head branch name to clipboard