1.2
a98c1c6c · fix merge conflicts in info file ·