Commit cbad612e authored by Alexander.Trofimov's avatar Alexander.Trofimov

Merge branch 'feature/lf-line-endings' into develop

# Conflicts:
#	cell/.unit-tests/FormulaTests.js
#	cell/model/FormulaObjects/dateandtimeFunctions.js
parents 576dff3b 8904d3bc
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment