Closed ax3l closed 5 years ago
Just merging back master to dev to synchronize git histories after the 1.4.0 release.
master
dev
@ax3l can we solve this conflict on the terminal elese it will create a commit to the master.
uh, weird. let me do this manually I was playing to much GUI.
Just merging back
master
todev
to synchronize git histories after the 1.4.0 release.