]> BookStack Code Mirror - bookstack/commit
Merge branch 'custom_role_system'
authorDan Brown <redacted>
Sat, 5 Mar 2016 18:21:44 +0000 (18:21 +0000)
committerDan Brown <redacted>
Sat, 5 Mar 2016 18:21:44 +0000 (18:21 +0000)
commit80865b30a5d6a82e86d21e272ae58977d4430a64
tree160fa8f25fe814f50876719aad33f178ed09b870
parent479dd80a8c0a971e5fc5db8679f3677205e44109
parent8e6248f57f92d943a011c3219120d60ee4f2f00b
Merge branch 'custom_role_system'

Conflicts:
app/Repos/BookRepo.php
app/Repos/ChapterRepo.php
app/Repos/PageRepo.php
app/Entity.php
app/Repos/BookRepo.php
app/Repos/BookRepo.php.orig
app/Repos/ChapterRepo.php
app/Repos/ChapterRepo.php.orig
app/Repos/PageRepo.php
app/Repos/PageRepo.php.orig
Morty Proxy This is a proxified and sanitized view of the page, visit original site.