github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-15 00:16:28 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
211 Commits 13 Branches 210 Tags
80865b30a5d6a82e86d21e272ae58977d4430a64
Commit Graph

1 Commits

Author SHA1 Message Date
Dan Brown
80865b30a5 Merge branch 'custom_role_system' 
Conflicts:
	app/Repos/BookRepo.php
	app/Repos/ChapterRepo.php
	app/Repos/PageRepo.php
 2016-03-05 18:21:44 +00:00