From: Dan Brown <redacted>
Date: Sun, 10 Mar 2019 10:31:09 +0000 (+0000)
Subject: Merge branch 'feature-ldap-attributes' of git://github.com/dfanara/BookStack into... 
X-Git-Tag: v0.25.2~1^2^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6bccf0e64a2c59d6d7db67472d133df446b91392

Merge branch 'feature-ldap-attributes' of git://github.com/dfanara/BookStack into dfanara-feature-ldap-attributes
---

6bccf0e64a2c59d6d7db67472d133df446b91392