Merge pull request #10 from BookStackApp/master

author Abijeet Patro <redacted>

Tue, 2 May 2017 20:11:08 +0000 (01:41 +0530)

committer GitHub <redacted>

Tue, 2 May 2017 20:11:08 +0000 (01:41 +0530)
author Abijeet Patro <redacted>
Tue, 2 May 2017 20:11:08 +0000 (01:41 +0530)
committer GitHub <redacted>
Tue, 2 May 2017 20:11:08 +0000 (01:41 +0530)
diff --cc app/Services/PermissionService.php
Simple merge
diff --cc config/app.php
Simple merge
diff --cc resources/assets/js/directives.js
Simple merge
diff --cc resources/lang/en/entities.php
Simple merge
author	Abijeet Patro <redacted>
	Tue, 2 May 2017 20:11:08 +0000 (01:41 +0530)
committer	GitHub <redacted>
	Tue, 2 May 2017 20:11:08 +0000 (01:41 +0530)
		1	2
app/Services/PermissionService.php	patch \|	diff1 \|	diff2 \|	blob \| history
config/app.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/assets/js/directives.js	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/en/entities.php	patch \|	diff1 \|	diff2 \|	blob \| history