Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: DE: update for the strings quattro: added editor buttons to comments quattro: cleanup the less file * master:
This commit is contained in:
* remotes/upstream/master: DE: update for the strings quattro: added editor buttons to comments quattro: cleanup the less file * master: