From: Dan Brown <redacted>
Date: Sat, 7 Dec 2019 20:36:39 +0000 (+0000)
Subject: Merge branch 'settings-color-selector' of git://github.com/james-geiger/BookStack... 
X-Git-Tag: v0.28.0~1^2~39
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/615a050856b1200d9dd37d94838b7d9b4a425afa

Merge branch 'settings-color-selector' of git://github.com/james-geiger/BookStack into james-geiger-settings-color-selector
---

615a050856b1200d9dd37d94838b7d9b4a425afa