Merge branch 'master' into logo-update
authorCamila Ayres <hello@camila.codes>
Fri, 6 Sep 2019 13:42:02 +0000 (15:42 +0200)
committerGitHub <noreply@github.com>
Fri, 6 Sep 2019 13:42:02 +0000 (15:42 +0200)
commitec603b061dc6dd34c76eb6ac3f916c331e60089b
tree939a4b4e1677c2c9e7706b58337e17b07ff55fe1
parentabb2711d26091e6ebda7b024f91fb72cbcba6d40
parent0353724472bdc9bc144013b2ee36893733f6394f
Merge branch 'master' into logo-update
src/gui/CMakeLists.txt