Text changes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
merging changes
merging changes
merging changes
Just run composer [trigger:composer]
Bug fixes
Fixed issue with datatable sorting [trigger:composer]
bug fixes
Text changes
Text changes
Merge remote-tracking branch 'upstream/master'
Text changes
Text changes
Merge pull request #32 from shalomleib/my-branch

My branch
Bug fixes
Bug fixes
Bug fixes
merging conflicts