1.1 -> 1.2
1.1 -> 1.2
fixed issue with gitignore file
fixed issue with gitignore file
.gitignore should be working now
.gitignore should be working now
fixed conflict in .gitignore file
fixed conflict in .gitignore file
fixed conflict
fixed conflict
fixed conflict
fixed conflict
fixed other conflict
fixed other conflict
resolved conflicts
resolved conflicts
Merge branch 'release/1.6'
Merge branch 'release/1.6'
Merge branch 'release/1.7'
Merge branch 'release/1.7'