search

xcp-ng / host-installer_old

XCP-ng installer
16 stars 15 forks source link

Merge xs 8.2 #20

Closed stormi closed 4 years ago

stormi commented 4 years ago

Result of the merge of the XS-8.2.0 tag into master.

Especially check the conflict resolution (branch from master, merge tag XS-8.2.0, solve conflict, compare with my diff)

stormi commented 4 years ago

Well, I guess everyone trusts my conflict solving blindly. Merging.