Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'c073cb3679fc7c057aea1f24a3d7f5f746bacad0'
# Conflicts: # source/class/qxl/datagrid/column/NumberColumn.js
- Loading branch information