merging info block config
Merge branch 'Features/dashboard' of github.com:SaltySoft/SmartBlocks into Features/dashboard
merging
Merge branch 'Features/dashboard' of github.com:SaltySoft/SmartBlocks into Features/dashboard
merging